fix remaining build & run issues for python server integration.

PiperOrigin-RevId: 636615848 Change-Id: I0a8dbd7878bb1a0f4a4c4dc8e8ca5dcdb0e07190
google · May 23, 2024 · db286cd · db286cd
1 parent 41097b5
commit db286cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@
 
 plugins {
     id 'net.ltgt.errorprone' apply false
+    id "com.github.johnrengelman.shadow"
 }
 
 subprojects {
@@ -11,6 +12,7 @@ subprojects {
     apply plugin: "signing"
 
     apply plugin: 'net.ltgt.errorprone'
+    apply plugin: 'com.github.johnrengelman.shadow'
 
     group = 'com.google.tsunami'
     version = '0.0.23-SNAPSHOT' // Current Tsunami version
@@ -99,6 +101,12 @@ subprojects {
         ]
     }
 
+    // Resolving conflicting NameResolverProvider from grpc-core.jar and
+    // grpc-netty-shaded.jar, https://github.com/grpc/grpc-java/issues/10853
+    shadowJar {
+        mergeServiceFiles()
+    }
+
     if (rootProject.properties.get('errorProne', true)) {
         dependencies {
             errorprone "com.google.errorprone:error_prone_core:${errorproneVersion}"

diff --git a/quick_start_advanced.sh b/quick_start_advanced.sh
@@ -134,4 +134,4 @@ printf "  --ip-v4-target=127.0.0.1 \\\\\n"
 printf "  --scan-results-local-output-format=JSON \\\\\n"
 printf "  --scan-results-local-output-filename=/tmp/tsunami-output.json \\\\\n"
 printf "  --python-plugin-server-address=127.0.0.1 \\\\\n"
-printf "  --python-plugin-server-ports=34567 \n"
+printf "  --python-plugin-server-port=34567 \n"