This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new 0b149982 upgrade to latest scala (2.13.18, 2.12.21, 3.3.7) (#560)
(#565)
0b149982 is described below
commit 0b14998293878036075874c22bec2f1d87908a3f
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Dec 11 11:21:23 2025 +0100
upgrade to latest scala (2.13.18, 2.12.21, 3.3.7) (#560) (#565)
* upgrade to latest scala (2.13.18, 2.12.21) (#560)
* update CI
---
.github/workflows/build-test.yml | 2 +-
.github/workflows/publish-1.1-snapshots.yml | 4 ++--
.github/workflows/publish-1.2-snapshots.yml | 4 ++--
.github/workflows/publish-nightly.yml | 4 ++--
plugin-tester-java/build.gradle | 2 +-
project/Dependencies.scala | 6 +++---
sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 4 +---
sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt | 4 +---
sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt | 4 +---
sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 4 +---
.../gen-java/05-duplicate-messages-different-packages/build.sbt | 4 +---
sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt | 4 +---
.../src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 4 +---
.../src/sbt-test/gen-scala-server/02-multiple-services/build.sbt | 4 +---
sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt | 4 +---
.../src/sbt-test/gen-scala-server/04-server-reflection/build.sbt | 4 +---
.../src/sbt-test/gen-scala-server/05-no-java-package/build.sbt | 4 +---
.../sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt | 4 +---
.../gen-scala-server/07-gen-basic-server-with-pekko/build.sbt | 4 +---
.../sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt | 4 +---
.../src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt | 4 +---
.../11-duplicate-messages-different-packages/build.sbt | 4 +---
sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt | 2 +-
23 files changed, 28 insertions(+), 60 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 651b8f97..1131d97a 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.12.20, 2.13.16, 3.3.6]
+ SCALA_VERSION: [2.12.21, 2.13.18, 3.3.7]
JAVA_VERSION: [8, 11, 17, 21]
steps:
- name: Checkout
diff --git a/.github/workflows/publish-1.1-snapshots.yml
b/.github/workflows/publish-1.1-snapshots.yml
index 841d820b..cf505b10 100644
--- a/.github/workflows/publish-1.1-snapshots.yml
+++ b/.github/workflows/publish-1.1-snapshots.yml
@@ -39,8 +39,8 @@ jobs:
run: |-
cp .jvmopts-ci .jvmopts
sbt +publish
- sbt ++2.13.16! codegen/publish
- sbt ++3.3.6! codegen/publish
+ sbt ++2.13.18! codegen/publish
+ sbt ++3.3.7! codegen/publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PW: ${{ secrets.NEXUS_PW }}
diff --git a/.github/workflows/publish-1.2-snapshots.yml
b/.github/workflows/publish-1.2-snapshots.yml
index 074e2042..744b269a 100644
--- a/.github/workflows/publish-1.2-snapshots.yml
+++ b/.github/workflows/publish-1.2-snapshots.yml
@@ -39,8 +39,8 @@ jobs:
run: |-
cp .jvmopts-ci .jvmopts
sbt +publish
- sbt ++2.13.16! codegen/publish
- sbt ++3.3.6! codegen/publish
+ sbt ++2.13.18! codegen/publish
+ sbt ++3.3.7! codegen/publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PW: ${{ secrets.NEXUS_PW }}
diff --git a/.github/workflows/publish-nightly.yml
b/.github/workflows/publish-nightly.yml
index 4d17a786..725147f8 100644
--- a/.github/workflows/publish-nightly.yml
+++ b/.github/workflows/publish-nightly.yml
@@ -38,8 +38,8 @@ jobs:
run: |-
cp .jvmopts-ci .jvmopts
sbt +publish
- sbt ++2.13.16! codegen/publish
- sbt ++3.3.6! codegen/publish
+ sbt ++2.13.18! codegen/publish
+ sbt ++3.3.7! codegen/publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PW: ${{ secrets.NEXUS_PW }}
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index 0132dad8..630ca8cc 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -24,7 +24,7 @@ repositories {
mavenLocal()
}
-def scalaFullVersion = "2.12.20"
+def scalaFullVersion = "2.12.21"
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 8904952b..ffefadc4 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -16,9 +16,9 @@ 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.16"
- val scala3 = "3.3.6"
+ 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.
val CrossScalaForLib = Seq(scala212, scala213, scala3)
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 2cd7e569..679a84db 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 0c4ef7cd..187ca581 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 0c4ef7cd..187ca581 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 2cd7e569..679a84db 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 0c4ef7cd..187ca581 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 85a4a25d..627fdda5 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
@@ -7,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
organization := "org.apache.pekko"
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 8a5dafa6..7eea5a3c 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
@@ -7,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
scalacOptions += "-Xfatal-warnings"
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 e562718e..834dbd3c 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,8 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 4d5ffa10..a968d9c8 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 e562718e..834dbd3c 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,8 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 e562718e..834dbd3c 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,8 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 68b3b044..7aab1ed8 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
@@ -7,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
enablePlugins(ProtocGoPlugin) // enable it first to test possibility of
getting overriden
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 674c7547..ab0c12b5 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 7837a9cc..b5e53261 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,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
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 574714b8..6a1d5926 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
@@ -7,9 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.20"
+scalaVersion := "2.12.21"
//#setup
import scalapb.GeneratorOption._
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 4292fcb4..834dbd3c 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,8 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-// Can be removed when we move to 2.12.14
-// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.21"
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 b6e668cf..68e19369 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
@@ -7,7 +7,7 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-scalaVersion := "3.3.0"
+scalaVersion := "3.3.7"
scalacOptions += "-Xfatal-warnings"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
