This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new e358e90d upgrade to latest scala (2.13.18, 2.12.21) (#560)
e358e90d is described below
commit e358e90dae52df4c9d71107c2c80603b069e4552
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Dec 11 08:47:27 2025 +0100
upgrade to latest scala (2.13.18, 2.12.21) (#560)
---
.github/workflows/build-test.yml | 2 +-
.github/workflows/publish-nightly.yml | 2 +-
benchmark-java/build.sbt | 2 +-
plugin-tester-java/build.gradle | 2 +-
plugin-tester-scala/build.gradle | 2 +-
project/Dependencies.scala | 4 ++--
sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 2 +-
.../gen-java/05-duplicate-messages-different-packages/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/02-multiple-services/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/04-server-reflection/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt | 2 +-
.../gen-scala-server/07-gen-basic-server-with-pekko/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt | 2 +-
.../11-duplicate-messages-different-packages/build.sbt | 2 +-
sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt | 2 +-
24 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index cc4b1ad3..f9808bef 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -80,7 +80,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- SCALA_VERSION: [2.13.17, 3.3.7]
+ SCALA_VERSION: [2.13.18, 3.3.7]
JAVA_VERSION: [17, 21]
steps:
- name: Checkout
diff --git a/.github/workflows/publish-nightly.yml
b/.github/workflows/publish-nightly.yml
index ead1f26e..35b1cca7 100644
--- a/.github/workflows/publish-nightly.yml
+++ b/.github/workflows/publish-nightly.yml
@@ -38,7 +38,7 @@ jobs:
run: |-
cp .jvmopts-ci .jvmopts
sbt +publish
- sbt ++2.13.17! codegen/publish
+ sbt ++2.13.18! codegen/publish
sbt ++3.3.7! codegen/publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
index a817bffb..44dfb89a 100644
--- a/benchmark-java/build.sbt
+++ b/benchmark-java/build.sbt
@@ -9,7 +9,7 @@
enablePlugins(PekkoGrpcPlugin)
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails",
"-XX:+PrintGCTimeStamps")
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index 8d102dfc..5ff60e3b 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -24,7 +24,7 @@ repositories {
mavenLocal()
}
-def scalaFullVersion = "2.13.17"
+def scalaFullVersion = "2.13.18"
def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
index 3a528639..a96da67f 100644
--- a/plugin-tester-scala/build.gradle
+++ b/plugin-tester-scala/build.gradle
@@ -19,7 +19,7 @@ repositories {
mavenLocal()
}
-def scalaFullVersion = "2.13.17"
+def scalaFullVersion = "2.13.18"
def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f4283fb3..a83cdee1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -16,8 +16,8 @@ import buildinfo.BuildInfo
object Dependencies {
object Versions {
// Update the .github workflows when these scala versions change
- val scala212 = "2.12.20"
- val scala213 = "2.13.17"
+ val scala212 = "2.12.21"
+ val scala213 = "2.13.18"
val scala3 = "3.3.7"
// the order in the list is important because the head will be considered
the default.
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
index 371b3d33..1ec3126a 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
index 24a3e057..f67b3ce2 100644
--- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
index 24a3e057..f67b3ce2 100644
--- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
index 371b3d33..1ec3126a 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
index 24a3e057..f67b3ce2 100644
---
a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
index 24a3e057..f67b3ce2 100644
--- a/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
index eee5c5a5..1455a57e 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -9,7 +9,7 @@
organization := "org.apache.pekko"
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
val grpcVersion = "1.77.0" // checked synced by VersionSyncCheckPlugin
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
index 6283db84..f98fe57d 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
@@ -9,7 +9,7 @@
scalacOptions += "-Xfatal-warnings"
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
index 7410ff2b..d957a1aa 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
@@ -7,6 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
index 0ed6142b..8e257482 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
index 7410ff2b..d957a1aa 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
@@ -7,6 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
index 7410ff2b..d957a1aa 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
@@ -7,6 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
index 53a09f60..5503f639 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
@@ -9,6 +9,6 @@
enablePlugins(ProtocGoPlugin) // enable it first to test possibility of
getting overriden
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
index 87db8c9a..c84c2090 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
index ef6c4346..b3fd2ece 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
index b956b03a..b25a3ab4 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
@@ -10,7 +10,7 @@
//#setup
import scalapb.GeneratorOption._
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
index 7410ff2b..d957a1aa 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
@@ -7,6 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
index cf2e0daf..90fc72d9 100644
--- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
+++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
@@ -11,7 +11,7 @@ scalaVersion := "3.3.0"
scalacOptions += "-Xfatal-warnings"
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
