From 04a07c9e7bb2cb6c0e527d1ef180018905047dd8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 17 Apr 2024 18:18:59 +0000 Subject: [PATCH 1/6] Update nscplugin, 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 d241e5aa1..df669c8b5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") From ec03a8da96a02301a75c89e44e1b86ea8088124d Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 19 Apr 2024 20:55:02 +0200 Subject: [PATCH 2/6] Use `nativeConfig` to enable link stubs --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 66d81b836..6e1f8cdbe 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ addCommandAlias("fmt", "all scalafmtSbt scalafmtAll") ThisBuild / PB.protocVersion := versions.protobuf lazy val sharedNativeSettings = List( - nativeLinkStubs := true // for utest + nativeConfig ~= { _.withLinkStubs(true) } // for utest ) lazy val root: Project = From 30738e95e6e144eeecba62d33c1391ca65b2425a Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Sat, 20 Apr 2024 08:32:03 +0200 Subject: [PATCH 3/6] Update scala-collection-compat to 2.12.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b8e8e7ffc..95274fc7c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val grpc = "1.63.0" val protobuf = "4.26.0" val silencer = "1.7.16" - val collectionCompat = "2.11.0" + val collectionCompat = "2.12.0" val coursier = "2.1.9" val protocGen = "0.9.7" val protobufRuntimeScala = "0.8.14" From 756c7c4a809fdbba282ce80cc90f25cefa3c481e Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Sun, 21 Apr 2024 09:56:12 +0200 Subject: [PATCH 4/6] Update munit to 1.0.0-M12 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 95274fc7c..61f4a72ec 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -17,7 +17,7 @@ object Dependencies { val annotationApi = "1.3.2" val cats = "2.6.1" val mockito = "5.11.0" - val munit = "1.0.0-M8" + val munit = "1.0.0-M12" val scalaTest = "3.2.18" val scalaTestPlusMockito = "3.1.0.0" val scalaTestPlusScalaCheck = "3.2.18.0" From f49cdde8ba9097322b22c3581e98e2af6693894f Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 22 Apr 2024 21:36:04 +0200 Subject: [PATCH 5/6] Use Java 11 to run `grpcRuntimeJVM*/test` --- test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 071182ac6..705b4a308 100755 --- a/test.sh +++ b/test.sh @@ -6,9 +6,11 @@ sbt \ lensesJVM${SCALA_VERSION}/test \ compilerPluginJVM${SCALA_VERSION}/test \ runtimeJVM${SCALA_VERSION}/test \ - grpcRuntimeJVM${SCALA_VERSION}/test \ proptestJVM${SCALA_VERSION}/test +# grpcRuntimeJVM*/test uses mockito 5.x and requires Java 11 +sbt -java-home ${JAVA_HOME_11_X64} grpcRuntimeJVM${SCALA_VERSION}/test + if [[ $SCALA_VERSION = 2* ]]; then sbt \ lensesJS${SCALA_VERSION}/test \ From ddf9a2c7e8eb604dc1e9b072fb52952c04d8e8ba Mon Sep 17 00:00:00 2001 From: Nadav Samet Date: Sun, 28 Apr 2024 11:40:25 -0700 Subject: [PATCH 6/6] Bump protobuf-scala-runtime to 0.8.15 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 61f4a72ec..132469975 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val collectionCompat = "2.12.0" val coursier = "2.1.9" val protocGen = "0.9.7" - val protobufRuntimeScala = "0.8.14" + val protobufRuntimeScala = "0.8.15" val commonsCodec = "1.16.1" // For testing