Skip to content

Commit

Permalink
Update grpc-core, grpc-interop-testing, ... to 1.66.0 (#354)
Browse files Browse the repository at this point in the history
* Update grpc-core, grpc-interop-testing, ... to 1.66.0

* grpc 1.66.0

* try to fix issue with sbt-assembly and duplicate classes

try assembly fix - take 2

Update build.sbt

try again

more sbt-assembly issues

scalafmt

try to fix gradle build

* default to MergeStrategy.deduplicate

---------

Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com>
Co-authored-by: PJ Fanning <[email protected]>
  • Loading branch information
scala-steward-asf[bot] and pjfanning committed Aug 12, 2024
1 parent 9f0e7ff commit 7298824
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion benchmark-java/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+Prin
// generate both client and server (default) in Java
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)

val grpcVersion = "1.65.1" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.66.0" // checked synced by VersionSyncCheckPlugin

val runtimeProject = ProjectRef(file("../"), "runtime")

Expand Down
4 changes: 4 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ lazy val codegen = Project(id = "codegen", base = file("codegen"))
(assembly / mainClass) := Some("org.apache.pekko.grpc.gen.Main"),
(assembly / assemblyOption) := (assembly / assemblyOption).value.withPrependShellScript(
Some(sbtassembly.AssemblyPlugin.defaultUniversalScript(shebang = true))),
(assembly / assemblyMergeStrategy) := {
case PathList("META-INF", _*) => MergeStrategy.discard
case _ => MergeStrategy.deduplicate
},
crossScalaVersions := Dependencies.Versions.CrossScalaForPlugin,
scalaVersion := scala212,
Compile / unmanagedSourceDirectories ++= {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class PekkoGrpcPluginExtension {

static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"

static final String GRPC_VERSION = "1.65.1" // checked synced by VersionSyncCheckPlugin
static final String GRPC_VERSION = "1.66.0" // checked synced by VersionSyncCheckPlugin

static final String PLUGIN_CODE = 'org.apache.pekko.grpc.gradle'

Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<pekko.http.version>1.1.0-M1</pekko.http.version>
<grpc.version>1.65.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.66.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<pekko.version>1.1.0-M1</pekko.version>
<pekko.http.version>1.1.0-M1</pekko.http.version>
<grpc.version>1.65.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.66.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object Dependencies {
val pekkoHttp = PekkoHttpDependency.version
val pekkoHttpBinary = pekkoHttp.take(3)

val grpc = "1.65.1" // checked synced by VersionSyncCheckPlugin
val grpc = "1.66.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 org.apache.pekko.grpc.sbt.PekkoGrpcPlugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ scalaVersion := "2.12.19"

organization := "org.apache.pekko"

val grpcVersion = "1.65.1" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.66.0" // checked synced by VersionSyncCheckPlugin

libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ enablePlugins(PekkoGrpcPlugin)

assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
case PathList("google", "protobuf", _) => MergeStrategy.discard
case PathList("google", "protobuf", _, _) => MergeStrategy.discard
case PathList("google", "protobuf", _*) => MergeStrategy.discard
case PathList("META-INF", _*) => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ enablePlugins(PekkoGrpcPlugin)

assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
case PathList("google", "protobuf", _) => MergeStrategy.discard
case PathList("google", "protobuf", _, _) => MergeStrategy.discard
case PathList("google", "protobuf", _*) => MergeStrategy.discard
case PathList("META-INF", _*) => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
Expand Down

0 comments on commit 7298824

Please sign in to comment.