Inline dependencies of the callback server. This allows for easier large-scale dependency changes.

tooryx · copybara-github · commit 5be227c90bd4 · 2025-08-21T07:42:39.000-07:00
PiperOrigin-RevId: 797760096
Change-Id: I9e20d85475339c065bc5471754b6e6504df6ba94
diff --git a/build.gradle b/build.gradle
@@ -21,65 +21,9 @@ subprojects {
         mavenLocal()
     }
 
-    ext {
-        // All dependency versions.
-        autoValueVersion = '1.10.4'
-        bouncycastleVersion = '1.64'
-        errorproneVersion = '2.38.0'
-        floggerVersion = '0.5.1'
-        grpcVersion = '1.29.0'
-        guavaVersion = '31.0.1-jre'
-        guiceVersion = '6.0.0'
-        javaxInjectVersion = '1'
-        jedisVersion = '2.9.0'
-        jcommanderVersion = '1.48'
-        nettyVersion = '4.1.72.Final'
-        protobufVersion = '3.11.4'
-        protocVersion = protobufVersion
-        snakeyamlVersion = '1.26'
-        junitVersion = '4.13'
-        mockitoVersion = '5.12.0'
-        truthVersion = '1.0.1'
-
-        // All Tsunami Callback Server dependencies.
-        deps = [
-                autovalue: "com.google.auto.value:auto-value-annotations:${autoValueVersion}",
-                autovalue_annotation_processor: "com.google.auto.value:auto-value:${autoValueVersion}",
-                bouncycastle_provider: "org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}",
-                errorprone: "com.google.errorprone:error_prone_annotations:${errorproneVersion}",
-                flogger: "com.google.flogger:flogger:${floggerVersion}",
-                flogger_google_ext: "com.google.flogger:google-extensions:${floggerVersion}",
-                flogger_backend: "com.google.flogger:flogger-system-backend:${floggerVersion}",
-                guava: "com.google.guava:guava:${guavaVersion}",
-                guice: "com.google.inject:guice:${guiceVersion}",
-                guice_assisted: "com.google.inject.extensions:guice-assistedinject:${guiceVersion}",
-                grpc_protobuf: "io.grpc:grpc-protobuf:${grpcVersion}",
-                javax_inject: "javax.inject:javax.inject:${javaxInjectVersion}",
-                jedis: "redis.clients:jedis:${jedisVersion}",
-                jcommander: "com.beust:jcommander:${jcommanderVersion}",
-                netty_buffer: "io.netty:netty-buffer:${nettyVersion}",
-                netty_codec_dns: "io.netty:netty-codec-dns:${nettyVersion}",
-                netty_codec_http: "io.netty:netty-codec-http:${nettyVersion}",
-                netty_common: "io.netty:netty-common:${nettyVersion}",
-                netty_transport: "io.netty:netty-transport:${nettyVersion}",
-                protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
-                protobuf_lite: "com.google.protobuf:protobuf-javalite:${protobufVersion}",
-                protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}",
-                snakeyaml: "org.yaml:snakeyaml:${snakeyamlVersion}",
-
-                // Test dependencies.
-                guava_testlib: "com.google.guava:guava-testlib:${guavaVersion}",
-                junit: "junit:junit:${junitVersion}",
-                mockito: "org.mockito:mockito-core:${mockitoVersion}",
-                truth: "com.google.truth:truth:${truthVersion}",
-                truth8: "com.google.truth.extensions:truth-java8-extension:${truthVersion}",
-                truth_protobuf: "com.google.truth.extensions:truth-proto-extension:${truthVersion}",
-        ]
-    }
-
     if (rootProject.properties.get('errorProne', true)) {
         dependencies {
-            errorprone "com.google.errorprone:error_prone_core:${errorproneVersion}"
+            errorprone "com.google.errorprone:error_prone_core:2.38.0"
             errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
         }
 
diff --git a/common/build.gradle b/common/build.gradle
@@ -1,18 +1,23 @@
 description = 'Tsunami Callback Server: Common'
 
 dependencies {
-    implementation deps.autovalue
-    implementation deps.bouncycastle_provider
-    implementation deps.flogger, deps.flogger_google_ext, deps.flogger_backend
-    implementation deps.guava
-    implementation deps.guice
-    implementation deps.javax_inject
-    implementation deps.snakeyaml
-    implementation deps.truth
-    annotationProcessor deps.autovalue_annotation_processor
+    implementation "com.google.auto.value:auto-value-annotations:1.10.4"
+    implementation "org.bouncycastle:bcprov-jdk15on:1.64"
+    implementation "com.google.flogger:flogger:0.5.1"
+    implementation "com.google.flogger:google-extensions:0.5.1"
+    implementation "com.google.flogger:flogger-system-backend:0.5.1"
+    implementation "com.google.guava:guava:31.0.1-jre"
+    implementation "com.google.inject:guice:6.0.0"
+    implementation "javax.inject:javax.inject:1"
+    implementation "org.yaml:snakeyaml:1.26"
+    implementation "com.google.truth:truth:1.0.1"
 
-    testImplementation deps.guava_testlib
-    testImplementation deps.junit
-    testImplementation deps.truth, deps.truth8, deps.truth_protobuf
-    testAnnotationProcessor deps.autovalue_annotation_processor
+    annotationProcessor "com.google.auto.value:auto-value:1.10.4"
+    testAnnotationProcessor "com.google.auto.value:auto-value:1.10.4"
+
+    testImplementation "com.google.guava:guava-testlib:1.29.0"
+    testImplementation "junit:junit:4.13"
+    testImplementation "com.google.truth:truth:1.0.1"
+    testImplementation "com.google.truth.extensions:truth-java8-extension:1.0.1"
+    testImplementation "com.google.truth.extensions:truth-proto-extension:1.0.1"
 }
diff --git a/main/build.gradle b/main/build.gradle
@@ -9,14 +9,15 @@ dependencies {
     implementation project(':tcs-common')
     implementation project(':tcs-server')
     implementation project(':tcs-storage')
-    implementation deps.flogger
-    implementation deps.flogger_google_ext
-    implementation deps.guava
-    implementation deps.guice
-    implementation deps.jcommander
 
-    testImplementation deps.junit
-    testImplementation deps.truth
+    implementation "com.google.flogger:flogger:0.5.1"
+    implementation "com.google.flogger:google-extensions:0.5.1"
+    implementation "com.google.guava:guava:31.0.1-jre"
+    implementation "com.google.inject:guice:6.0.0"
+    implementation "com.beust:jcommander:1.48"
+
+    testImplementation "junit:junit:4.13"
+    testImplementation "com.google.truth:truth:1.0.1"
 }
 
 application {
diff --git a/proto/build.gradle b/proto/build.gradle
@@ -16,11 +16,11 @@ sourceSets {
 protobuf {
     generatedFilesBaseDir = "${projectDir}/build/generated"
     protoc {
-        artifact = "com.google.protobuf:protoc:${protocVersion}"
+        artifact = "com.google.protobuf:protoc:3.11.4"
     }
     plugins {
         grpc {
-            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.29.0"
         }
     }
     generateProtoTasks {
@@ -43,8 +43,8 @@ idea {
 }
 
 dependencies {
-    implementation deps.protobuf
-    implementation deps.grpc_protobuf
+    implementation "com.google.protobuf:protobuf-java:3.11.4"
+    implementation "io.grpc:grpc-protobuf:1.29.0"
 }
 
 
diff --git a/server/build.gradle b/server/build.gradle
@@ -4,17 +4,26 @@ dependencies {
     implementation project(':tcs-common')
     implementation project(':tcs-proto')
     implementation project(':tcs-storage')
-    implementation deps.flogger
-    implementation deps.flogger_google_ext
-    implementation deps.guava
-    implementation deps.guice
-    implementation deps.javax_inject
-    implementation deps.netty_buffer, deps.netty_codec_dns, deps.netty_codec_http, deps.netty_common, deps.netty_transport
-    implementation deps.protobuf, deps.protobuf_lite, deps.protobuf_util
 
-    testImplementation deps.guava_testlib
-    testImplementation deps.junit
-    testImplementation deps.truth, deps.truth8, deps.truth_protobuf
+    implementation "com.google.flogger:flogger:0.5.1"
+    implementation "com.google.flogger:google-extensions:0.5.1"
+    implementation "com.google.guava:guava:31.0.1-jre"
+    implementation "com.google.inject:guice:6.0.0"
+    implementation "javax.inject:javax.inject:1"
+    implementation "io.netty:netty-buffer:4.1.72.Final"
+    implementation "io.netty:netty-codec-dns:4.1.72.Final"
+    implementation "io.netty:netty-codec-http:4.1.72.Final"
+    implementation "io.netty:netty-common:4.1.72.Final"
+    implementation "io.netty:netty-transport:4.1.72.Final"
+    implementation "com.google.protobuf:protobuf-java:3.11.4"
+    implementation "com.google.protobuf:protobuf-javalite:3.11.4"
+    implementation "com.google.protobuf:protobuf-java-util:3.11.4"
+
+    testImplementation "com.google.guava:guava-testlib:1.29.0"
+    testImplementation "junit:junit:4.13"
+    testImplementation "com.google.truth:truth:1.0.1"
+    testImplementation "com.google.truth.extensions:truth-java8-extension:1.0.1"
+    testImplementation "com.google.truth.extensions:truth-proto-extension:1.0.1"
 }
 
 tasks.named("shadowJar") {
diff --git a/storage/build.gradle b/storage/build.gradle
@@ -3,18 +3,21 @@ description = 'Tsunami Callback Server: storage'
 dependencies {
     implementation project(':tcs-common')
     implementation project(':tcs-proto')
-    implementation deps.flogger
-    implementation deps.flogger_google_ext
-    implementation deps.guava
-    implementation deps.guice
-    implementation deps.javax_inject
-    implementation deps.jedis
-    implementation deps.protobuf_util
 
-    testImplementation deps.guava_testlib
-    testImplementation deps.junit
-    testImplementation deps.mockito
-    testImplementation deps.truth, deps.truth8, deps.truth_protobuf
+    implementation "com.google.flogger:flogger:0.5.1"
+    implementation "com.google.flogger:google-extensions:0.5.1"
+    implementation "com.google.guava:guava:31.0.1-jre"
+    implementation "com.google.inject:guice:6.0.0"
+    implementation "javax.inject:javax.inject:1"
+    implementation "redis.clients:jedis:2.9.0"
+    implementation "com.google.protobuf:protobuf-java-util:3.11.4"
+
+    testImplementation "com.google.guava:guava-testlib:1.29.0"
+    testImplementation "junit:junit:4.13"
+    testImplementation "org.mockito:mockito-core:5.12.0"
+    testImplementation "com.google.truth:truth:1.0.1"
+    testImplementation "com.google.truth.extensions:truth-java8-extension:1.0.1"
+    testImplementation "com.google.truth.extensions:truth-proto-extension:1.0.1"
 }
 
 tasks.named("compileJava") {

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ sourceSets {`
`16`	`16`	`protobuf {`
`17`	`17`	`generatedFilesBaseDir = "${projectDir}/build/generated"`
`18`	`18`	`protoc {`
`19`		`- artifact = "com.google.protobuf:protoc:${protocVersion}"`
	`19`	`+ artifact = "com.google.protobuf:protoc:3.11.4"`
`20`	`20`	`}`
`21`	`21`	`plugins {`
`22`	`22`	`grpc {`
`23`		`- artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"`
	`23`	`+ artifact = "io.grpc:protoc-gen-grpc-java:1.29.0"`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`generateProtoTasks {`
`@@ -43,8 +43,8 @@ idea {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`dependencies {`
`46`		`- implementation deps.protobuf`
`47`		`- implementation deps.grpc_protobuf`
	`46`	`+ implementation "com.google.protobuf:protobuf-java:3.11.4"`
	`47`	`+ implementation "io.grpc:grpc-protobuf:1.29.0"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`