From 03761b229c490f2e222445cba86ac2a535d4eec5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 28 May 2021 09:46:38 +0200 Subject: [PATCH 1/4] Update scala-library to 2.12.14 --- .github/workflows/build-test.yml | 14 +++++++------- project/Dependencies.scala | 2 +- .../sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 +- .../gen-java/02-server-reflection/build.sbt | 2 +- .../sbt-test/gen-java/03-no-java-package/build.sbt | 2 +- .../gen-java/04-crash-on-keywords/build.sbt | 2 +- .../sbt-test/gen-scala-server/00-interop/build.sbt | 2 +- .../gen-scala-server/01-gen-basic-server/build.sbt | 2 +- .../02-multiple-services/build.sbt | 2 +- .../gen-scala-server/03-test-config/build.sbt | 2 +- .../04-server-reflection/build.sbt | 2 +- .../gen-scala-server/05-no-java-package/build.sbt | 2 +- .../06-compatibility-plugins/build.sbt | 2 +- .../07-gen-basic-server-with-akka-26/build.sbt | 2 +- .../09-scalapb-customizations/build.sbt | 2 +- .../gen-scala-server/10-scalapb-validate/build.sbt | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8ca828028..7082c6577 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: - name: Code style check and binary-compatibility check run: |- cp .jvmopts-travis .jvmopts - sbt scalafmtCheckAll scalafmtSbtCheck headerCheckAll grpcVersionSyncCheck ++2.13.3 mimaReportBinaryIssues ++2.12.11 mimaReportBinaryIssues + sbt scalafmtCheckAll scalafmtSbtCheck headerCheckAll grpcVersionSyncCheck ++2.13.3 mimaReportBinaryIssues ++2.12.14 mimaReportBinaryIssues compile-benchmarks: @@ -67,9 +67,9 @@ jobs: fail-fast: false matrix: include: - - SCALA_VERSION: 2.12.11 + - SCALA_VERSION: 2.12.14 JABBA_JDK: 1.8.0-275 - - SCALA_VERSION: 2.12.11 + - SCALA_VERSION: 2.12.14 JABBA_JDK: 1.11.0-9 - SCALA_VERSION: 2.13.3 JABBA_JDK: 1.8.0-275 @@ -164,7 +164,7 @@ jobs: - name: Test Gradle Java Scala 2.12 run: |- cp .jvmopts-travis .jvmopts - sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.11 akka-grpc-runtime/publishM2 + sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.14 akka-grpc-runtime/publishM2 cd gradle-plugin ./gradlew clean publishToMavenLocal --console=plain --info --stacktrace find ~/.m2 | grep gradle @@ -184,7 +184,7 @@ jobs: - name: Test Gradle Scala 2.12 run: |- cp .jvmopts-travis .jvmopts - sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.11 akka-grpc-runtime/publishM2 + sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.14 akka-grpc-runtime/publishM2 cd gradle-plugin ./gradlew clean publishToMavenLocal --console=plain --info --stacktrace find ~/.m2 | grep gradle @@ -258,7 +258,7 @@ jobs: - name: Test Maven Java run: |- cp .jvmopts-travis .jvmopts - sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.11 akka-grpc-runtime/publishM2 ++2.13.3 akka-grpc-runtime/publishM2 + sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.14 akka-grpc-runtime/publishM2 ++2.13.3 akka-grpc-runtime/publishM2 sbt akka-grpc-maven-plugin/publishM2 cd plugin-tester-java mvn -Dakka.grpc.project.version=`cat ~/.version` akka-grpc:generate compile @@ -266,7 +266,7 @@ jobs: - name: Test Maven Scala run: |- cp .jvmopts-travis .jvmopts - sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.11 akka-grpc-runtime/publishM2 ++2.13.3 akka-grpc-runtime/publishM2 + sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 ++2.12.14 akka-grpc-runtime/publishM2 ++2.13.3 akka-grpc-runtime/publishM2 sbt akka-grpc-maven-plugin/publishM2 cd plugin-tester-scala mvn -Dakka.grpc.project.version=`cat ~/.version` akka-grpc:generate scala:compile diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 99f04ed82..2d5107587 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import buildinfo.BuildInfo object Dependencies { object Versions { - val scala212 = "2.12.11" + val scala212 = "2.12.14" val scala213 = "2.13.3" // 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 d95b7a1e4..ac0cace84 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 1845eed19..023751ba6 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 1845eed19..023751ba6 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 d95b7a1e4..ac0cace84 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 9489c1722..980668907 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 28e65740c..aff1e190a 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 bda9f1104..e0437ec66 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 fa39a0a08..44869cdfc 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 bda9f1104..e0437ec66 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 bda9f1104..e0437ec66 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 c3a386d19..4fd16bd44 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-26/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-26/build.sbt index 8d87a1734..abd60c35c 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-26/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-26/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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 84c5d22cb..9c1f7f1c9 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") 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 4e5891faa..cc25972c2 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.11" +scalaVersion := "2.12.14" resolvers += Resolver.sonatypeRepo("staging") From ba5f8d38412a1b2fd68ad4fee308dd06ecfadb95 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 31 May 2021 14:30:40 +0200 Subject: [PATCH 2/4] Update silencer to 1.7.5 --- project/Common.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Common.scala b/project/Common.scala index a90a20fe9..b4c5af807 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -29,7 +29,7 @@ object Common extends AutoPlugin { licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")), description := "Akka gRPC - Support for building streaming gRPC servers and clients on top of Akka Streams.") - val silencerVersion = "1.7.1" + val silencerVersion = "1.7.5" override lazy val projectSettings = Seq( projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value), sonatypeProfileName := "com.lightbend", From 4986ebbb0c010fa8fb760ff5a8d45cad8a826d7b Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 12 Jul 2021 14:12:45 +0200 Subject: [PATCH 3/4] collection-compat 2.5.0 --- project/Dependencies.scala | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2d5107587..7059aba0b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -59,6 +59,7 @@ object Dependencies { val protocJar = "com.github.os72" % "protoc-jar" % "3.11.4" val plexusBuildApi = "org.sonatype.plexus" % "plexus-build-api" % "0.0.7" % "optional" // Apache v2 + val collectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.5.0" } object Test { @@ -84,7 +85,13 @@ object Dependencies { private val l = libraryDependencies - val codegen = l ++= Seq(Compile.scalapbCompilerPlugin, Test.scalaTest) + val codegen = l ++= Seq( + Compile.scalapbCompilerPlugin, + // Temporarily added: this is a transitive + // dependency, but we want to pull it up to + // at least version 2.5.0 + Compile.collectionCompat, + Test.scalaTest) val runtime = l ++= Seq( Compile.scalapbRuntime, @@ -96,6 +103,10 @@ object Dependencies { Compile.akkaHttp, Compile.akkaDiscovery, Compile.akkaHttpCors % "provided", + // Temporarily added: this is a transitive + // dependency, but we want to pull it up to + // at least version 2.5.0 + Compile.collectionCompat, Test.akkaDiscoveryConfig, Test.akkaTestkit, Test.scalaTest, From 9e4276cbe7b5848137e0027ea7b19c77844d713e Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 12 Jul 2021 16:53:48 +0200 Subject: [PATCH 4/4] Also update travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a4fdb6b8..562cae0d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: scala scala: - - 2.12.11 + - 2.12.14 - 2.13.3 # make sure to fetch enough commits, so that git describe still works