Upgade grpc version, use bom instead of manually specifying each time

Partial deephaven#1270
niloc132 · Dec 20, 2021 · 9b93835 · 9b93835
1 parent 2d47153
commit 9b93835
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 129 deletions.
diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
@@ -81,6 +81,9 @@ class Classpaths {
     static final String GROOVY_GROUP = 'org.codehaus.groovy'
     static final String GROOVY_VERSION = '3.0.9'
 
+    static final String GRPC_GROUP = 'io.grpc'
+    static final String GRPC_VERSION = '1.42.0'
+
     static boolean addDependency(Configuration conf, String group, String name, String version, Action<? super DefaultExternalModuleDependency> configure = Actions.doNothing()) {
         if (!conf.dependencies.find { it.name == name && it.group == group}) {
             DefaultExternalModuleDependency dep = dependency group, name, version
@@ -195,4 +198,9 @@ class Classpaths {
         Configuration config = p.configurations.getByName(configName)
         addDependency(config, GROOVY_GROUP, name, GROOVY_VERSION)
     }
+
+    static void inheritGrpcPlatform(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
+        Configuration config = p.configurations.getByName(configName)
+        addDependency(config, p.getDependencies().platform(GRPC_GROUP + ":" + 'grpc-bom' + ":" + GRPC_VERSION))
+    }
 }
diff --git a/grpc-api/grpc-api.gradle b/grpc-api/grpc-api.gradle
@@ -47,6 +47,11 @@ dependencies {
         runtimeOnly project(':extensions-suanshu')
     }
 
+    Classpaths.inheritGrpcPlatform(project, 'implementation')
+    implementation "io.grpc:grpc-services"
+
+    testImplementation "io.grpc:grpc-testing"
+
     testImplementation TestTools.projectDependency(project, 'engine-table'),
                 TestTools.projectDependency(project, 'Util')
 

diff --git a/java-client/session-dagger/build.gradle b/java-client/session-dagger/build.gradle
@@ -7,6 +7,9 @@ description = 'The Deephaven client session dagger library'
 dependencies {
     api project(':java-client-session')
 
+    Classpaths.inheritGrpcPlatform(project, 'implementation')
+    implementation 'io.grpc:grpc-api'
+
     Classpaths.inheritDagger(project)
 
     Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')

diff --git a/java-client/session-examples/build.gradle b/java-client/session-examples/build.gradle
@@ -8,6 +8,9 @@ dependencies {
 
     implementation 'info.picocli:picocli:4.6.1'
 
+    Classpaths.inheritGrpcPlatform(project, 'implementation')
+    implementation 'io.grpc:grpc-core'
+
     Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)
     testImplementation 'org.junit.jupiter:junit-jupiter'

diff --git a/java-client/session/build.gradle b/java-client/session/build.gradle
@@ -9,6 +9,9 @@ dependencies {
   api project(':proto:proto-backplane-grpc')
   api project(':uri')
 
+  Classpaths.inheritGrpcPlatform(project, 'implementation')
+  implementation "io.grpc:grpc-stub"
+
   Classpaths.inheritImmutables(project)
 
   compileOnly 'javax.inject:javax.inject:1'
@@ -19,6 +22,7 @@ dependencies {
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
   testImplementation 'junit:junit:4.13.2'
+  testImplementation 'io.grpc:grpc-testing'
 
   Classpaths.inheritAssertJ(project)
 

diff --git a/proto/build.gradle b/proto/build.gradle
diff --git a/proto/proto-backplane-grpc/build.gradle b/proto/proto-backplane-grpc/build.gradle
@@ -1,23 +1,48 @@
 plugins {
   id 'com.bmuschko.docker-remote-api'
+  id 'java-library'
 }
 
 evaluationDependsOn Docker.registryProject('protoc-base')
 
 description = 'The Deephaven proto-backplane-grpc'
 
-configurations.create('download')
-configurations.download.transitive=false
+configurations {
+  download {
+    transitive = false
+  }
+
+  // automatically pick up the standard junit version
+  testCompile.extendsFrom junit
+}
+
+// TODO(deephaven-core#1685): Create strategy around updating and maintaining protoc version
+def protobufVersion = '3.17.3'
+def boringSslVersion = '2.0.34.Final'
 
 dependencies {
+  // This should be implementation, if listed at all, at least once we have own own version management
+  api "com.google.protobuf:protobuf-java:${protobufVersion}"
+
+  Classpaths.inheritGrpcPlatform(project, 'implementation')
+  implementation "io.grpc:grpc-protobuf"
+  implementation "io.grpc:grpc-api"
+  implementation "io.grpc:grpc-stub"
+
+  runtimeOnly "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}"
+
+  // This is excessive, and brings in every grpc jar, making it compile-only limits what it pulls in to
+  // downstream classpaths
+  Classpaths.inheritArrow(project, 'flight-core', 'compileOnly')
+
+  compileOnly 'javax.inject:javax.inject:1'
+  compileOnly "javax.annotation:javax.annotation-api:1.3.1"
+
   // technically we should have a runtime dependency on barrage-core, but instead we are regenerating
   // the same output that it contains, and we have declared the correct dependencies as necessary
   //  compile 'io.deephaven.barrage:barrage-core:0.2.0'
   download 'io.deephaven.barrage:barrage-core:0.2.0'
   Classpaths.inheritArrow(project, 'flight-core', 'download')
-  Classpaths.inheritArrow(project, 'flight-core', 'compileOnly')
-
-  compileOnly 'javax.inject:javax.inject:1'
 }
 
 TaskProvider<Task> generateProtobuf = Docker.registerDockerTask(project, 'generateProtobuf') {