Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to latest version. #1623

Merged
merged 3 commits into from
Jun 27, 2022
Merged

Update dependencies to latest version. #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f72708
Update dependencies to latest version.
counter2015 Jun 22, 2022
c3d22f0
Fix gradle CI check.
counter2015 Jun 23, 2022
1b8097e
Downgrade protoc version to 3.20.1
counter2015 Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions benchmark-java/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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",
counter2015 marked this conversation as resolved.
Show resolved Hide resolved
"org.scalatestplus" %% "junit-4-12" % "3.2.2.0" % "test"),
PB.artifactResolver := PB.artifactResolver.dependsOn(codeGenProject / Compile / publishLocal).value)

compile / javacOptions += "-Xlint:deprecation"
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcServerJava.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
8 changes: 4 additions & 4 deletions plugin-tester-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion plugin-tester-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions plugin-tester-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion runtime/src/main/scala/akka/grpc/internal/GrpcEntityHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-26/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down