From 31bc5164e4a5fd79a9b0f622f35c482ba4240981 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 6 Apr 2024 11:21:17 +0200 Subject: [PATCH] upgrade build (#262) * upgrade build * Update build-test.yml --- .github/workflows/build-test.yml | 9 +++++---- .github/workflows/publish-1.0-nightly.yml | 4 ++-- .github/workflows/publish-nightly.yml | 4 ++-- plugin-tester-java/build.gradle | 2 +- plugin-tester-scala/build.gradle | 2 +- .../src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 +- .../src/sbt-test/gen-java/02-server-reflection/build.sbt | 2 +- .../src/sbt-test/gen-java/03-no-java-package/build.sbt | 2 +- .../src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 2 +- .../05-duplicate-messages-different-packages/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/00-interop/build.sbt | 2 +- .../gen-scala-server/01-gen-basic-server/build.sbt | 2 +- .../gen-scala-server/02-multiple-services/build.sbt | 2 +- .../sbt-test/gen-scala-server/03-test-config/build.sbt | 2 +- .../gen-scala-server/04-server-reflection/build.sbt | 2 +- .../gen-scala-server/05-no-java-package/build.sbt | 2 +- .../gen-scala-server/06-compatibility-plugins/build.sbt | 2 +- .../07-gen-basic-server-with-pekko/build.sbt | 2 +- .../gen-scala-server/09-scalapb-customizations/build.sbt | 2 +- .../gen-scala-server/10-scalapb-validate/build.sbt | 2 +- 20 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 79832e6f..63f0af82 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -65,8 +65,8 @@ jobs: strategy: fail-fast: false matrix: - SCALA_VERSION: [2.12.18, 2.13.12, 3.3.1] - JAVA_VERSION: [8, 11] + SCALA_VERSION: [2.12.19, 2.13.13, 3.3.3] + JAVA_VERSION: [8, 11, 17] steps: - name: Checkout uses: actions/checkout@v4 @@ -84,6 +84,7 @@ jobs: - name: Compile and test for JDK ${{ matrix.JAVA_VERSION }}, Scala ${{ matrix.SCALA_VERSION }} run: |- + cp .jvmopts-ci .jvmopts sbt ++${{ matrix.SCALA_VERSION }} test sbt ++${{ matrix.SCALA_VERSION }}! codegen/test @@ -148,7 +149,7 @@ jobs: cat ~/.version - name: Cache local Gradle repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -204,7 +205,7 @@ jobs: cat ~/.version - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('plugin-tester-*/pom.xml') }} diff --git a/.github/workflows/publish-1.0-nightly.yml b/.github/workflows/publish-1.0-nightly.yml index be9bdc36..502e4c48 100644 --- a/.github/workflows/publish-1.0-nightly.yml +++ b/.github/workflows/publish-1.0-nightly.yml @@ -28,8 +28,8 @@ jobs: run: |- cp .jvmopts-ci .jvmopts sbt +publish - sbt ++2.13.12! codegen/publish - sbt ++3.3.1! codegen/publish + sbt ++2.13.13! codegen/publish + sbt ++3.3.3! 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 9dc50071..6995fc1c 100644 --- a/.github/workflows/publish-nightly.yml +++ b/.github/workflows/publish-nightly.yml @@ -27,8 +27,8 @@ jobs: run: |- cp .jvmopts-ci .jvmopts sbt +publish - sbt ++2.13.12! codegen/publish - sbt ++3.3.1! codegen/publish + sbt ++2.13.13! codegen/publish + sbt ++3.3.3! 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 95207063..8f41b7bf 100644 --- a/plugin-tester-java/build.gradle +++ b/plugin-tester-java/build.gradle @@ -24,7 +24,7 @@ repositories { mavenLocal() } -def scalaFullVersion = "2.12.18" +def scalaFullVersion = "2.12.19" 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 a7c5d884..b8f0b3c6 100644 --- a/plugin-tester-scala/build.gradle +++ b/plugin-tester-scala/build.gradle @@ -19,7 +19,7 @@ repositories { mavenLocal() } -def scalaFullVersion = "2.12.18" +def scalaFullVersion = "2.12.19" def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion) def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}" 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 da3a7fb7..8e72f39a 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.18" +scalaVersion := "2.12.19" 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 deb275e8..b62ea645 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.18" +scalaVersion := "2.12.19" 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 deb275e8..b62ea645 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.18" +scalaVersion := "2.12.19" 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 da3a7fb7..8e72f39a 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.18" +scalaVersion := "2.12.19" 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 deb275e8..b62ea645 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.18" +scalaVersion := "2.12.19" 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 02abf11c..faf8c2ae 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.18" +scalaVersion := "2.12.19" 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 d15c7511..77768a2f 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.18" +scalaVersion := "2.12.19" 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 4292fcb4..34851e68 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.18" +scalaVersion := "2.12.19" 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 43cc4b09..c408af04 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.18" +scalaVersion := "2.12.19" 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 4292fcb4..34851e68 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.18" +scalaVersion := "2.12.19" 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 4292fcb4..34851e68 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.18" +scalaVersion := "2.12.19" 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 ec0271f3..31b64e02 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.18" +scalaVersion := "2.12.19" 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 73ac401e..fb4c1a37 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.18" +scalaVersion := "2.12.19" 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 310830d1..fd80d904 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.18" +scalaVersion := "2.12.19" 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 10eb344a..5ca0c2ce 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.18" +scalaVersion := "2.12.19" //#setup import scalapb.GeneratorOption._