From d22607a1a411ad9c80545abb2c928d6cd008f265 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 17 Apr 2024 00:12:06 +0000 Subject: [PATCH 1/9] Update sbt-scala-native to 0.5.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e5f4cfb45e..c85ede26eb 100644 --- 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 From 8bf024c4506c7692fbd8e05dda391fa7e18a36aa Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 13:26:11 +0200 Subject: [PATCH 2/9] Update build.sbt --- build.sbt | 34 ++-------------------------------- project/Versions.scala | 4 ++-- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/build.sbt b/build.sbt index ef38481d01..840e03982e 100644 --- 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.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) diff --git a/project/Versions.scala b/project/Versions.scala index 2bcc50d042..c9a0f4c2dc 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -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" From 0b2b4c09a6b3bcf7ae7bd5062137b3b06cc9bbca Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 15:12:45 +0200 Subject: [PATCH 3/9] Don't build testing for native --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index 840e03982e..c03f48c437 100644 --- a/build.sbt +++ b/build.sbt @@ -482,7 +482,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")) From d79794a8f9aa96ddf55795e67fbfd3d156ad1618 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 15:24:20 +0200 Subject: [PATCH 4/9] A few more necessary native exclusions --- build.sbt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/build.sbt b/build.sbt index c03f48c437..5795b7c7d9 100644 --- a/build.sbt +++ b/build.sbt @@ -1838,10 +1838,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")) @@ -1915,15 +1911,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")) From 01ab446269bcf5f442c7735923a151cd0f9f2968 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 16:23:53 +0200 Subject: [PATCH 5/9] Remove scala-java-time dependency --- build.sbt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 5795b7c7d9..10d7e99093 100644 --- a/build.sbt +++ b/build.sbt @@ -447,14 +447,7 @@ 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 - ) - ) - } + settings = commonNativeSettings ) //.enablePlugins(spray.boilerplate.BoilerplatePlugin) @@ -867,11 +860,7 @@ 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 - ) - ) + settings = commonNativeSettings ) .dependsOn(core) From 350969628cb94f277befdc702f6459be9755e39b Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 16:24:08 +0200 Subject: [PATCH 6/9] Update scalacheck --- project/Versions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Versions.scala b/project/Versions.scala index c9a0f4c2dc..a58c6c00b6 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -28,7 +28,7 @@ object Versions { val ox = "0.0.26" 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" From bad21e740ab3885f32c0785df046349aa08064ac Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 16:50:58 +0200 Subject: [PATCH 7/9] Update upickle --- project/Versions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Versions.scala b/project/Versions.scala index a58c6c00b6..db4214c1f1 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -17,7 +17,7 @@ object Versions { 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" From 05f68e2bd87fe7bda8d024a89354e4b45acc2043 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 16:59:32 +0200 Subject: [PATCH 8/9] Remove native from all modules --- build.sbt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build.sbt b/build.sbt index 10d7e99093..9d77a4188e 100644 --- a/build.sbt +++ b/build.sbt @@ -445,10 +445,6 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core")) ) ) ) - .nativePlatform( - scalaVersions = List(scala3), - settings = commonNativeSettings - ) //.enablePlugins(spray.boilerplate.BoilerplatePlugin) lazy val files: ProjectMatrix = (projectMatrix in file("files")) @@ -461,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")) @@ -858,10 +853,6 @@ lazy val uPickleJson: ProjectMatrix = (projectMatrix in file("json/upickle")) ) ) ) - .nativePlatform( - scalaVersions = List(scala3), - settings = commonNativeSettings - ) .dependsOn(core) lazy val picklerJson: ProjectMatrix = (projectMatrix in file("json/pickler")) @@ -1166,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) @@ -1838,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")) From cdf64584585abe15c2744d3f6b853fe8d0639a49 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Thu, 25 Apr 2024 14:38:55 +0200 Subject: [PATCH 9/9] Update Magnolia to 1.3.6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9d77a4188e..991d2b226b 100644 --- a/build.sbt +++ b/build.sbt @@ -417,7 +417,7 @@ 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.5") + Seq("com.softwaremill.magnolia1_3" %%% "magnolia" % "1.3.6") case _ => Seq( "com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.9",