Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate codebase to Cats Effect 3 #91

Closed
wants to merge 4 commits into from
Closed

Migrate codebase to Cats Effect 3 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c24697
Migrate codebase to Cats Effect 3
May 15, 2021
40efbd8
Fix threading issue with ActorSystem. Add more hikariCP params.
May 15, 2021
58224f0
Clean sbt file
May 15, 2021
e37152b
Implement Docker logger as a Resource.
May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ scalacOptions ++= Seq(

publishArtifact := false

parallelExecution in Test := false
parallelExecution in IntegrationTest := false
Test / parallelExecution := false
IntegrationTest / parallelExecution := false

fork in (Test, test) := true
fork in (IntegrationTest, test) := true
fork in (IntegrationTest, testOnly) := true
Test / test / fork := true
IntegrationTest / test / fork := true
IntegrationTest / testOnly / fork := true

enablePlugins(BuildInfoPlugin, DockerPlugin)
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")

configs(IntegrationTest)
ManagerDev.settings
Defaults.itSettings

buildInfoKeys := Seq[BuildInfoKey](
Expand All @@ -44,8 +44,8 @@ buildInfoKeys := Seq[BuildInfoKey](
buildInfoPackage := "io.hydrosphere.serving"
buildInfoOptions += BuildInfoOption.ToJson

imageNames in docker := Seq(ImageName(s"hydrosphere/serving-manager:${version.value}"))
dockerfile in docker := {
docker / imageNames := Seq(ImageName(s"hydrosphere/serving-manager:${version.value}"))
docker / dockerfile := {
val jarFile: File = (Compile / packageBin / sbt.Keys.`package`).value
val classpath = (Compile / dependencyClasspath).value
val localConfigFile = baseDirectory.value / "src" / "main" / "resources" / "application.conf"
Expand Down Expand Up @@ -73,11 +73,7 @@ dockerfile in docker := {
}
}

resolvers += Resolver.bintrayRepo("streamz", "maven")
resolvers +=
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/staging"

libraryDependencies ++= Dependencies.all

lazy val root = project.in(file(".")).dependsOn(streamz % "compile->compile")
lazy val streamz = ProjectRef(uri("https://github.com/krasserm/streamz.git"), "converter")
15 changes: 7 additions & 8 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ object Dependencies {
val awsSdkVersion = "1.11.312"
val servingGrpcScala = "3.0.0-dev3"
val circeVersion = "0.13.0"
val catsV = "2.2.0"
val envoyDataPlaneApi = "v1.6.0_1"
val fs2 = "2.4.4"
val catsV = "3.1.1"
val fs2 = "3.0.3"
val enumeratumV = "1.6.0"
val mockitoScalaV = "1.16.37"
val monocleV = "3.0.0-M4"
val doobieV = "1.0.0-M2"

lazy val awsDependencies = Seq(
"com.amazonaws" % "aws-java-sdk-ecs" % awsSdkVersion,
Expand Down Expand Up @@ -97,11 +97,10 @@ object Dependencies {
Seq(
"org.typelevel" %% "kittens" % "2.2.1",
"org.typelevel" %% "cats-effect" % catsV,
"org.tpolecat" %% "doobie-core" % "0.9.0",
"org.tpolecat" %% "doobie-postgres" % "0.9.0",
"org.tpolecat" %% "doobie-scalatest" % "0.9.0" % "test, it",
"com.zaxxer" % "HikariCP" % "2.6.3", // doobie-hikari depends on hikari 3.3.1 which has weird pool retries.
"org.postgresql" % "postgresql" % postgresqlVersion,
"org.tpolecat" %% "doobie-core" % doobieV,
"org.tpolecat" %% "doobie-postgres" % doobieV,
"org.tpolecat" %% "doobie-hikari" % doobieV,
"org.tpolecat" %% "doobie-scalatest" % doobieV % "test, it",
"org.flywaydb" % "flyway-core" % "4.2.0",
"com.spotify" % "docker-client" % "8.16.0" exclude ("ch.qos.logback", "logback-classic"),
"com.google.guava" % "guava" % "22.0",
Expand Down
190 changes: 0 additions & 190 deletions project/ManagerDev.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.4.0
sbt.version = 1.5.0
Loading