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.

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

Update sbt-scala-native to 0.5.1 #3692

Merged
merged 11 commits into from
Apr 26, 2024
Prev Previous commit
Next Next commit
Update build.sbt
kciesielski committed Apr 24, 2024

Verified

This commit was signed with the committer’s verified signature.
kciesielski Krzysztof Ciesielski
commit 8bf024c4506c7692fbd8e05dda391fa7e18a36aa
34 changes: 2 additions & 32 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -417,10 +417,10 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core"))
libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) =>
Seq("com.softwaremill.magnolia1_3" %%% "magnolia" % "1.3.4")
Seq("com.softwaremill.magnolia1_3" %%% "magnolia" % "1.3.5")
case _ =>
Seq(
"com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.8",
"com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.9",
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
)
}
@@ -502,10 +502,6 @@ lazy val tests: ProjectMatrix = (projectMatrix in file("tests"))
scalaVersions = scala2And3Versions,
settings = commonJsSettings
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings
)
.dependsOn(core, files, circeJson, cats)

lazy val perfServerJavaOptions = List(
@@ -592,14 +588,6 @@ lazy val cats: ProjectMatrix = (projectMatrix in file("integrations/cats"))
)
)
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings ++ Seq(
libraryDependencies ++= Seq(
"io.github.cquiroz" %%% "scala-java-time" % Versions.jsScalaJavaTime % Test
)
)
)
.dependsOn(core)

lazy val catsEffect: ProjectMatrix = (projectMatrix in file("integrations/cats-effect"))
@@ -618,10 +606,6 @@ lazy val catsEffect: ProjectMatrix = (projectMatrix in file("integrations/cats-e
scalaVersions = scala2And3Versions,
settings = commonJsSettings
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings
)
.dependsOn(core)

lazy val enumeratum: ProjectMatrix = (projectMatrix in file("integrations/enumeratum"))
@@ -789,10 +773,6 @@ lazy val circeJson: ProjectMatrix = (projectMatrix in file("json/circe"))
scalaVersions = scala2And3Versions,
settings = commonJsSettings
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings
)
.dependsOn(core)

lazy val json4s: ProjectMatrix = (projectMatrix in file("json/json4s"))
@@ -938,10 +918,6 @@ lazy val jsoniterScala: ProjectMatrix = (projectMatrix in file("json/jsoniter"))
scalaVersions = scala2And3Versions,
settings = commonJsSettings
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings
)
.dependsOn(core)

lazy val zioJson: ProjectMatrix = (projectMatrix in file("json/zio"))
@@ -1320,12 +1296,6 @@ lazy val http4sServer: ProjectMatrix = (projectMatrix in file("server/http4s-ser
"org.http4s" %%% "http4s-blaze-server" % Versions.http4sBlazeServer % Test
)
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings ++ Seq(
Test / skip := true
)
)
.dependsOn(serverCore, cats, catsEffect)

lazy val http4sServer2_12 = http4sServer.jvm(scala2_12).dependsOn(serverTests.jvm(scala2_12) % Test)
4 changes: 2 additions & 2 deletions project/Versions.scala
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ object Versions {
val circeYaml = "0.15.1"
val helidon = "4.0.0"
val sttp = "3.9.5"
val sttpModel = "1.7.9"
val sttpShared = "1.3.17"
val sttpModel = "1.7.10"
val sttpShared = "1.3.18"
val sttpApispec = "0.9.0"
val akkaHttp = "10.2.10"
val akkaStreams = "2.6.20"