Skip to content

Commit 7fafdd6

Browse files
avdvscala-stewardthesamet
authored
Update nscplugin, sbt-scala-native to 0.5.1 (#1682)
* Update nscplugin, sbt-scala-native to 0.5.1 * Use `nativeConfig` to enable link stubs * Update scala-collection-compat to 2.12.0 * Update munit to 1.0.0-M12 * Use Java 11 to run `grpcRuntimeJVM*/test` * Bump protobuf-scala-runtime to 0.8.15 --------- Co-authored-by: Scala Steward <[email protected]> Co-authored-by: Nadav Samet <[email protected]>
1 parent 0ddc8ea commit 7fafdd6

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ addCommandAlias("fmt", "all scalafmtSbt scalafmtAll")
2222
ThisBuild / PB.protocVersion := versions.protobuf
2323

2424
lazy val sharedNativeSettings = List(
25-
nativeLinkStubs := true // for utest
25+
nativeConfig ~= { _.withLinkStubs(true) } // for utest
2626
)
2727

2828
lazy val root: Project =

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ object Dependencies {
77
val grpc = "1.63.0"
88
val protobuf = "4.26.0"
99
val silencer = "1.7.16"
10-
val collectionCompat = "2.11.0"
10+
val collectionCompat = "2.12.0"
1111
val coursier = "2.1.9"
1212
val protocGen = "0.9.7"
13-
val protobufRuntimeScala = "0.8.14"
13+
val protobufRuntimeScala = "0.8.15"
1414
val commonsCodec = "1.16.1"
1515

1616
// For testing
1717
val annotationApi = "1.3.2"
1818
val cats = "2.6.1"
1919
val mockito = "5.11.0"
20-
val munit = "1.0.0-M8"
20+
val munit = "1.0.0-M12"
2121
val scalaTest = "3.2.18"
2222
val scalaTestPlusMockito = "3.1.0.0"
2323
val scalaTestPlusScalaCheck = "3.2.18.0"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0")
88

99
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1010

11-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
11+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
1212

1313
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
1414

test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ sbt \
66
lensesJVM${SCALA_VERSION}/test \
77
compilerPluginJVM${SCALA_VERSION}/test \
88
runtimeJVM${SCALA_VERSION}/test \
9-
grpcRuntimeJVM${SCALA_VERSION}/test \
109
proptestJVM${SCALA_VERSION}/test
1110

11+
# grpcRuntimeJVM*/test uses mockito 5.x and requires Java 11
12+
sbt -java-home ${JAVA_HOME_11_X64} grpcRuntimeJVM${SCALA_VERSION}/test
13+
1214
if [[ $SCALA_VERSION = 2* ]]; then
1315
sbt \
1416
lensesJS${SCALA_VERSION}/test \

0 commit comments

Comments
 (0)