Update dependencies to latest version. (#1623)

* Update dependencies to latest version. * Fix gradle CI check. * Downgrade protoc version to 3.20.1
akka · Jun 27, 2022 · 5448baa · 5448baa
1 parent 4aa0467
commit 5448baa
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
@@ -5,7 +5,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+Prin
 // generate both client and server (default) in Java
 akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)
 
-val grpcVersion = "1.46.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.47.0" // checked synced by VersionSyncCheckPlugin
 
 val runtimeProject = ProjectRef(file("../"), "akka-grpc-runtime")
 
@@ -23,10 +23,10 @@ val root = project
   .settings(
     libraryDependencies ++= Seq(
       "io.grpc" % "grpc-testing" % grpcVersion,
-      "org.hdrhistogram" % "HdrHistogram" % "2.1.10",
-      "org.apache.commons" % "commons-math3" % "3.6",
-      "org.scalatest" %% "scalatest" % "3.1.2" % "test",
-      "org.scalatestplus" %% "junit-4-12" % "3.1.2.0" % "test"),
+      "org.hdrhistogram" % "HdrHistogram" % "2.1.12",
+      "org.apache.commons" % "commons-math3" % "3.6.1",
+      "org.scalatest" %% "scalatest" % "3.2.12" % "test",
+      "org.scalatestplus" %% "junit-4-12" % "3.2.2.0" % "test"),
     PB.artifactResolver := PB.artifactResolver.dependsOn(codeGenProject / Compile / publishLocal).value)
 
 compile / javacOptions += "-Xlint:deprecation"
diff --git a/gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy b/gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy
@@ -9,7 +9,7 @@ class AkkaGrpcPluginExtension {
 
     static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"
 
-    static final String GRPC_VERSION = "1.46.0" // checked synced by VersionSyncCheckPlugin
+    static final String GRPC_VERSION = "1.47.0" // checked synced by VersionSyncCheckPlugin
 
     static final String PLUGIN_CODE = 'com.lightbend.akka.grpc.gradle'
 

diff --git a/interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcServerJava.java b/interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcServerJava.java
@@ -128,7 +128,7 @@ private HttpsConnectionContext serverHttpContext() throws Exception {
     SSLContext context = SSLContext.getInstance("TLS");
     context.init(keyManagerFactory.getKeyManagers(), null, new SecureRandom());
 
-    return HttpsConnectionContext.https(context);
+    return HttpsConnectionContext.httpsServer(context);
   }
 
 }
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
@@ -19,8 +19,8 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCA
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
 
 dependencies {
-  implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.0'
-  testImplementation "com.typesafe.akka:akka-stream-testkit_${scalaBinaryVersion}:2.6.9"
-  testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.1.2"
-  testImplementation "org.scalatestplus:junit-4-12_${scalaBinaryVersion}:3.1.2.0"
+  implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3'
+  testImplementation "com.typesafe.akka:akka-stream-testkit_${scalaBinaryVersion}:2.6.19"
+  testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.12"
+  testImplementation "org.scalatestplus:junit-4-12_${scalaBinaryVersion}:3.2.2.0"
 }
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
@@ -16,7 +16,7 @@
     <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
     <maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
     <akka.http.cors.version>1.1.0</akka.http.cors.version>
-    <grpc.version>1.46.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
+    <grpc.version>1.47.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
 

diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
@@ -14,9 +14,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCA
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
 
 dependencies {
-  implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.0'
-  testImplementation "com.typesafe.akka:akka-stream-testkit_${scalaBinaryVersion}:2.6.9"
-  testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.1.2"
-  testImplementation "org.scalatestplus:junit-4-12_${scalaBinaryVersion}:3.1.2.0"
+  implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3'
+  testImplementation "com.typesafe.akka:akka-stream-testkit_${scalaBinaryVersion}:2.6.19"
+  testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.12"
+  testImplementation "org.scalatestplus:junit-4-12_${scalaBinaryVersion}:3.2.2.0"
 }
 
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
@@ -15,7 +15,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <akka.version>2.5.13</akka.version>
     <akka.http.cors.version>0.4.2</akka.http.cors.version>
-    <grpc.version>1.46.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
+    <grpc.version>1.47.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -16,12 +16,12 @@ object Dependencies {
     // We don't force Akka updates because downstream projects can upgrade
     // themselves. For more information see
     // https://doc.akka.io//docs/akka/current/project/downstream-upgrade-strategy.html
-    val akka = "2.6.9"
+    val akka = "2.6.19"
     val akkaBinary = "2.6"
-    val akkaHttp = "10.2.8"
+    val akkaHttp = "10.2.9"
     val akkaHttpBinary = "10.2"
 
-    val grpc = "1.46.0" // checked synced by VersionSyncCheckPlugin
+    val grpc = "1.47.0" // checked synced by VersionSyncCheckPlugin
     // Even referenced explicitly in the sbt-plugin's sbt-tests
     // If changing this, remember to update protoc plugin version to align in
     // maven-plugin/src/main/maven/plugin.xml and akka.grpc.sbt.AkkaGrpcPlugin

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -30,4 +30,4 @@ libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.0.2021090
 // scripted testing
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 
-libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.10"
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.11"
diff --git a/runtime/src/main/scala/akka/grpc/internal/GrpcEntityHelpers.scala b/runtime/src/main/scala/akka/grpc/internal/GrpcEntityHelpers.scala
@@ -48,7 +48,7 @@ object GrpcEntityHelpers {
   import scala.annotation.unchecked.uncheckedVariance
   //A faster implementation of concat that does not allocate so much
   private def concatCheap[U, Mat2](that: Graph[SourceShape[U], Mat2]): Graph[FlowShape[U @uncheckedVariance, U], Mat2] =
-    GraphDSL.create(that) { implicit b => r =>
+    GraphDSL.createGraph(that) { implicit b => r =>
       import GraphDSL.Implicits._
       val merge = b.add(new Concat[U](2))
       r ~> merge.in(1)

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
@@ -6,7 +6,7 @@ resolvers += Resolver.sonatypeRepo("staging")
 
 organization := "com.lightbend.akka.grpc"
 
-val grpcVersion = "1.46.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.47.0" // checked synced by VersionSyncCheckPlugin
 
 libraryDependencies ++= Seq(
   "io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",

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
@@ -8,7 +8,7 @@ scalacOptions += "-Xfatal-warnings"
 
 enablePlugins(AkkaGrpcPlugin)
 
-assemblyMergeStrategy in assembly := {
+assembly / assemblyMergeStrategy  := {
   // https://github.com/akka/akka/issues/29456
   case PathList("google", "protobuf", _) => MergeStrategy.discard
   case PathList("google", "protobuf", _, _) => MergeStrategy.discard

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
@@ -8,7 +8,7 @@ enablePlugins(AkkaGrpcPlugin)
 
 dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.6.5"
 
-assemblyMergeStrategy in assembly := {
+assembly / assemblyMergeStrategy  := {
   // https://github.com/akka/akka/issues/29456
   case PathList("google", "protobuf", _) => MergeStrategy.discard
   case PathList("google", "protobuf", _, _) => MergeStrategy.discard