fix: remove dependencies from gradle files

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Aug 22, 2024 · daee5bf · daee5bf
1 parent 8c12682
commit daee5bf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
@@ -162,3 +162,7 @@ extraJavaModuleInfo {
     module("org.testcontainers:testcontainers", "org.testcontainers")
     module("org.mockito:mockito-junit-jupiter", "org.mockito.junit.jupiter")
 }
+
+// Make 'javax.annotation:javax.annotation-api' discoverable for merging it into
+// 'com.google.code.findbugs:jsr305'
+dependencies { "javaModulesMergeJars"("javax.annotation:javax.annotation-api:1.3.2") }
diff --git a/buildSrc/src/main/kotlin/com/hedera/block/tasks/GitClone.kt b/buildSrc/src/main/kotlin/com/hedera/block/tasks/GitClone.kt
@@ -59,7 +59,7 @@ abstract class GitClone : DefaultTask() {
                     commandLine(
                         "git",
                         "clone",
-                        "https://github.com/hashgraph/hedera-protobufs.git",
+                        url.get(),
                         "-q"
                     )
                 } else {

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -30,8 +30,6 @@ mainModuleInfo {
 }
 
 dependencies {
-    runtimeOnly("javax.annotation:javax.annotation-api:1.3.2") { because("java.annotation") }
-    runtimeOnly("com.google.guava:guava:33.0.0-jre") { because("com.google.common") }
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:2.21.1") { because("java.logging") }
 }
 

diff --git a/stream/build.gradle.kts b/stream/build.gradle.kts
@@ -54,25 +54,7 @@ sourceSets {
     }
 }
 
-dependencies {
-
-    // requires transitive in the module-info.java
-    api("com.google.protobuf:protobuf-java:3.24.0") { because("com.google.protobuf") }
-    api("com.hedera.pbj:pbj-runtime:0.9.2") { because("com.hedera.pbj.runtime") }
-    api("io.grpc:grpc-stub:1.64.0") { because("io.grpc.stub") }
-    api("io.grpc:grpc-api:1.64.0") { because("io.grpc") }
-    api("com.google.guava:guava:33.0.0-jre") { because("com.google.common") }
-
-    // requires static in the module-info.java
-    runtimeOnly("com.github.spotbugs:spotbugs-annotations:4.7.3") {
-        because("com.github.spotbugs.annotations")
-    }
-    runtimeOnly("javax.annotation:javax.annotation-api:1.3.2") { because("java.annotation") }
-}
-
 testModuleInfo {
-    requires("com.hedera.node.hapi")
-
     // we depend on the protoc compiled hapi during test as we test our pbj generated code
     // against it to make sure it is compatible
     requires("com.google.protobuf.util")