This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new fdf9da1b Update Scala 2 versions
fdf9da1b is described below
commit fdf9da1be39acf27baea30c668e9012ffa8b5f5f
Author: Matthew de Detrich <[email protected]>
AuthorDate: Tue Jun 6 19:15:43 2023 +0200
Update Scala 2 versions
---
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-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 +-
19 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index d021437e..1fd506fe 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -16,7 +16,7 @@ repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } //
TODO Remove when proper release of pekko-http-cors is made
}
-def scalaFullVersion = "2.12.17"
+def scalaFullVersion = "2.12.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 c440aeb9..f39836c0 100644
--- a/plugin-tester-scala/build.gradle
+++ b/plugin-tester-scala/build.gradle
@@ -11,7 +11,7 @@ repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } //
TODO Remove when proper release of pekko-http-cors is made
}
-def scalaFullVersion = "2.12.17"
+def scalaFullVersion = "2.12.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 5e17f268..163d8970 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -15,8 +15,8 @@ import buildinfo.BuildInfo
object Dependencies {
object Versions {
- val scala212 = "2.12.17"
- val scala213 = "2.13.10"
+ val scala212 = "2.12.18"
+ val scala213 = "2.13.11"
val scala3 = "3.3.0"
// 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 235a6a5e..1a846a3b 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 fbfc9477..67696437 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 fbfc9477..67696437 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 235a6a5e..1a846a3b 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 fbfc9477..67696437 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 8c8f7920..37b1e830 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 717e4014..dbec69f0 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 3f64aff7..8f1460d6 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 90da694d..5259b6a3 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 3f64aff7..8f1460d6 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 3f64aff7..8f1460d6 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 322850d4..01baaf2e 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 ae33e602..c02bb22d 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 cbdfa9f5..0b2892df 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 c6ef295e..eff58a72 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
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 3f64aff7..8f1460d6 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
@@ -1,6 +1,6 @@
// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
resolvers += Resolver.ApacheMavenSnapshotsRepo
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
