Update sbt-scala-native to 0.5.1 (#3692)

Co-authored-by: scala-steward <scala-steward> Co-authored-by: kciesielski <[email protected]>
softwaremill · Apr 26, 2024 · 7de1721 · 7de1721
1 parent bdc8b0b
commit 7de1721
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 73 deletions.
diff --git a/build.sbt b/build.sbt
@@ -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.6")
         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
           )
       }
@@ -445,17 +445,6 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core"))
       )
     )
   )
-  .nativePlatform(
-    scalaVersions = List(scala3),
-    settings = {
-      commonNativeSettings ++ Seq(
-        libraryDependencies ++= Seq(
-          "io.github.cquiroz" %%% "scala-java-time" % Versions.nativeScalaJavaTime,
-          "io.github.cquiroz" %%% "scala-java-time-tzdb" % Versions.nativeScalaJavaTime % Test
-        )
-      )
-    }
-  )
 //.enablePlugins(spray.boilerplate.BoilerplatePlugin)
 
 lazy val files: ProjectMatrix = (projectMatrix in file("files"))
@@ -468,7 +457,6 @@ lazy val files: ProjectMatrix = (projectMatrix in file("files"))
   )
   .jvmPlatform(scalaVersions = scala2And3Versions)
   .jsPlatform(scalaVersions = scala2And3Versions)
-  .nativePlatform(scalaVersions = List(scala3))
   .dependsOn(core)
 
 lazy val testing: ProjectMatrix = (projectMatrix in file("testing"))
@@ -482,7 +470,6 @@ lazy val testing: ProjectMatrix = (projectMatrix in file("testing"))
   )
   .jvmPlatform(scalaVersions = scala2And3Versions)
   .jsPlatform(scalaVersions = scala2And3Versions, settings = commonJsSettings)
-  .nativePlatform(scalaVersions = List(scala3), settings = commonNativeSettings)
   .dependsOn(core, circeJson % Test)
 
 lazy val tests: ProjectMatrix = (projectMatrix in file("tests"))
@@ -502,10 +489,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 +575,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 +593,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 +760,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"))
@@ -886,14 +853,6 @@ lazy val uPickleJson: ProjectMatrix = (projectMatrix in file("json/upickle"))
       )
     )
   )
-  .nativePlatform(
-    scalaVersions = List(scala3),
-    settings = commonNativeSettings ++ Seq(
-      libraryDependencies ++= Seq(
-        "io.github.cquiroz" %%% "scala-java-time" % Versions.nativeScalaJavaTime % Test
-      )
-    )
-  )
   .dependsOn(core)
 
 lazy val picklerJson: ProjectMatrix = (projectMatrix in file("json/pickler"))
@@ -938,10 +897,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"))
@@ -1202,7 +1157,6 @@ lazy val serverCore: ProjectMatrix = (projectMatrix in file("server/core"))
   .dependsOn(core % CompileAndTest)
   .jvmPlatform(scalaVersions = scala2And3Versions, settings = commonJvmSettings)
   .jsPlatform(scalaVersions = scala2And3Versions, settings = commonJsSettings)
-  .nativePlatform(scalaVersions = List(scala3), settings = commonNativeSettings)
 
 lazy val serverTests: ProjectMatrix = (projectMatrix in file("server/tests"))
   .settings(commonJvmSettings)
@@ -1320,12 +1274,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)
@@ -1869,10 +1817,6 @@ lazy val clientTests: ProjectMatrix = (projectMatrix in file("client/tests"))
     scalaVersions = scala2And3Versions,
     settings = commonJsSettings
   )
-  .nativePlatform(
-    scalaVersions = List(scala3),
-    settings = commonNativeSettings
-  )
   .dependsOn(tests)
 
 lazy val clientCore: ProjectMatrix = (projectMatrix in file("client/core"))
@@ -1884,7 +1828,6 @@ lazy val clientCore: ProjectMatrix = (projectMatrix in file("client/core"))
   )
   .jvmPlatform(scalaVersions = scala2And3Versions)
   .jsPlatform(scalaVersions = scala2And3Versions)
-  .nativePlatform(scalaVersions = List(scala3))
   .dependsOn(core)
 
 lazy val http4sClient: ProjectMatrix = (projectMatrix in file("client/http4s-client"))
@@ -1946,15 +1889,6 @@ lazy val sttpClient: ProjectMatrix = (projectMatrix in file("client/sttp-client"
       )
     )
   )
-  .nativePlatform(
-    scalaVersions = List(scala3),
-    settings = commonNativeSettings ++ Seq(
-      libraryDependencies ++= Seq(
-        "io.github.cquiroz" %%% "scala-java-time" % Versions.nativeScalaJavaTime % Test,
-        "io.github.cquiroz" %%% "scala-java-time-tzdb" % Versions.nativeScalaJavaTime % Test
-      )
-    )
-  )
   .dependsOn(clientCore, clientTests % Test)
 
 lazy val playClient: ProjectMatrix = (projectMatrix in file("client/play-client"))

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -9,15 +9,15 @@ 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.10.0"
   val akkaHttp = "10.2.10"
   val akkaStreams = "2.6.20"
   val pekkoHttp = "1.0.1"
   val pekkoStreams = "1.0.2"
   val swaggerUi = "5.17.0"
-  val upickle = "3.1.4"
+  val upickle = "3.3.0"
   val playJson = "3.0.1"
   val play29Json = "3.0.2"
   val finatra = "23.11.0"
@@ -28,7 +28,7 @@ object Versions {
   val ox = "0.1.0"
   val reactiveStreams = "1.0.4"
   val sprayJson = "1.3.6"
-  val scalaCheck = "1.17.1"
+  val scalaCheck = "1.18.0"
   val scalaTest = "3.2.18"
   val scalaTags = "0.13.1"
   val scalaTestPlusScalaCheck = "3.2.18.0"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -16,7 +16,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
 addSbtPlugin("io.gatling" % "gatling-sbt" % "4.8.2")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
 addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.4")
 addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2")
 // needed to override the Android flavor of Guava coming from pekko-grpc-sbt-plugin, which causes failures in Scala.JS builds