Merge pull request #1362 from scala-steward/update/scala-library-2.12.14

akka · Jul 12, 2021 · e59a555 · e59a555
2 parents 7e3293c + 9e4276c
commit e59a555
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 25 deletions.
diff --git 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
@@ -166,7 +166,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
@@ -186,7 +186,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
@@ -260,15 +260,15 @@ 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
 
       - 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/.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

diff --git a/project/Common.scala b/project/Common.scala
@@ -31,7 +31,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",

diff --git 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.
@@ -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,

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")