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 b3f75523 remove explicit scala version in sbt tests (#507)
b3f75523 is described below
commit b3f75523e182681fc5231b1e592156ef978942d8
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Sep 11 18:38:36 2025 +0100
remove explicit scala version in sbt tests (#507)
---
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 ----
sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt | 4 ----
.../src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt | 4 ----
.../gen-scala-server/07-gen-basic-server-with-pekko/build.sbt | 4 ----
.../src/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 ----
16 files changed, 64 deletions(-)
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..9d5cd682 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
javacOptions += "-Xdoclint:all"
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..3357c9c5 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
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..3357c9c5 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
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..9d5cd682 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
javacOptions += "-Xdoclint:all"
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..3357c9c5 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
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..795ea528 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,10 +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"
-
organization := "org.apache.pekko"
val grpcVersion = "1.75.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 8a5dafa6..08d5ffa3 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,10 +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"
-
scalacOptions += "-Xfatal-warnings"
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 e562718e..59a96a71 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,4 @@
* 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"
-
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..e91fa395 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
Compile / pekkoGrpcGeneratedSources := Seq(PekkoGrpc.Server)
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..59a96a71 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,4 @@
* 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"
-
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..59a96a71 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,4 @@
* 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"
-
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..43660344 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,10 +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"
-
enablePlugins(ProtocGoPlugin) // enable it first to test possibility of
getting overriden
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 674c7547..62d5ea34 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
assembly / assemblyMergeStrategy := {
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..2def39cc 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,10 +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"
-
enablePlugins(PekkoGrpcPlugin)
// Don't enable it flat_package globally, but via a package-level option
instead (see package.proto)
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..a9d7a880 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,10 +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"
-
//#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..59a96a71 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,4 @@
* 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"
-
enablePlugins(PekkoGrpcPlugin)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
