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 8a3cd46e scala 2.12.20 (#364)
8a3cd46e is described below
commit 8a3cd46e6534af2e7efc3a73a4513247c8791593
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Sep 16 10:26:55 2024 +0100
scala 2.12.20 (#364)
---
.github/workflows/build-test.yml | 2 +-
plugin-tester-java/build.gradle | 2 +-
plugin-tester-scala/build.gradle | 2 +-
project/Dependencies.scala | 2 +-
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-scala-server/00-interop/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 2 +-
sbt-plugin/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 +-
sbt-plugin/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 +-
.../sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt | 2 +-
.../src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt | 2 +-
sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 1f96d5a4..dba96d44 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -65,7 +65,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- SCALA_VERSION: [2.12.19, 2.13.14, 3.3.3]
+ SCALA_VERSION: [2.12.20, 2.13.14, 3.3.3]
JAVA_VERSION: [8, 11, 17, 21]
steps:
- name: Checkout
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index 19240dfb..1401ec8c 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -24,7 +24,7 @@ repositories {
mavenLocal()
}
-def scalaFullVersion = "2.12.19"
+def scalaFullVersion = "2.12.20"
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 664e2dff..d8806f3c 100644
--- a/plugin-tester-scala/build.gradle
+++ b/plugin-tester-scala/build.gradle
@@ -19,7 +19,7 @@ repositories {
mavenLocal()
}
-def scalaFullVersion = "2.12.19"
+def scalaFullVersion = "2.12.20"
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 a29153e4..6e89bcc5 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -16,7 +16,7 @@ import buildinfo.BuildInfo
object Dependencies {
object Versions {
// Update the .github workflows when these scala versions change
- val scala212 = "2.12.19"
+ val scala212 = "2.12.20"
val scala213 = "2.13.14"
val scala3 = "3.3.3"
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 fa3de259..2cd7e569 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 b62ea645..0c4ef7cd 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 b62ea645..0c4ef7cd 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 fa3de259..2cd7e569 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 b62ea645..0c4ef7cd 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 4352e560..0f8e5ab8 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 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 2acee0f7..8a5dafa6 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 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 34851e68..e562718e 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
@@ -9,6 +9,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 c408af04..4d5ffa10 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 34851e68..e562718e 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
@@ -9,6 +9,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 34851e68..e562718e 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
@@ -9,6 +9,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 31b64e02..68b3b044 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,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 ff3167d1..674c7547 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 fd80d904..7837a9cc 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
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 5ca0c2ce..574714b8 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
@@ -9,7 +9,7 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.19"
+scalaVersion := "2.12.20"
//#setup
import scalapb.GeneratorOption._
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
