Skip to content

Commit

Permalink
Merge pull request #1 from guardrail-dev/switch-to-pekko-http
Browse files Browse the repository at this point in the history
Switching over to pekko-http
  • Loading branch information
blast-hardcheese authored Dec 14, 2023
2 parents 58b40eb + 2366da2 commit a96dfda
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 17 deletions.
26 changes: 13 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Compile / guardrailTasks := List(
ScalaServer(file("petstore.yaml"), pkg="foo"),
ScalaServer(file("petstore.yaml"), pkg="foo", modules=List("pekko-http", "circe")),
)

val akkaVersion = "2.6.20"
val akkaHttpVersion = "10.2.10"
val pekkoVersion = "1.0.0"
val pekkoHttpVersion = "1.0.0"
val catsVersion = "2.6.1"
val circeVersion = "0.14.1"
val scalatestVersion = "3.2.9"
Expand All @@ -14,14 +14,14 @@ scalacOptions ++= Seq("-Ypartial-unification", "-deprecation")
libraryDependencies += "org.slf4j" % "slf4j-simple" % "1.7.30"

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion,
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion,
"javax.xml.bind" % "jaxb-api" % jaxbApiVersion,
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.typelevel" %% "cats-core" % catsVersion,
"org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion,
"org.apache.pekko" %% "pekko-stream" % pekkoVersion,
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion,
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion,
"javax.xml.bind" % "jaxb-api" % jaxbApiVersion,
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.typelevel" %% "cats-core" % catsVersion,
)
10 changes: 9 additions & 1 deletion project/guardrail.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
addSbtPlugin("dev.guardrail" % "sbt-guardrail" % "0.75.2")
addSbtPlugin("dev.guardrail" % "sbt-guardrail" % "1.0.0-SNAPSHOT")

libraryDependencies ++= Seq(
"dev.guardrail" %% "guardrail-scala-pekko-http" % "0.1.0-SNAPSHOT",
"dev.guardrail" %% "guardrail-core" % "1.0.0-SNAPSHOT",
"dev.guardrail" %% "guardrail-scala-support" % "1.0.0-SNAPSHOT",
)

resolvers += "Sonatype OSS Snapshots" at "https://s01.oss.sonatype.org/content/repositories/snapshots"
6 changes: 3 additions & 3 deletions src/main/scala/App.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent._
import scala.concurrent.duration.Duration

import akka.actor.ActorSystem
import akka.http.scaladsl.Http
import akka.http.scaladsl.model.ContentType
import org.apache.pekko.actor.ActorSystem
import org.apache.pekko.http.scaladsl.Http
import org.apache.pekko.http.scaladsl.model.ContentType

import foo.pet._
import foo.definitions.Pet
Expand Down

0 comments on commit a96dfda

Please sign in to comment.