Fix 'protobuf-javalite' vs 'protobuf-java'

Signed-off-by: Jendrik Johannes <[email protected]>
hashgraph · Feb 20, 2024 · 8dcdd0c · 8dcdd0c
1 parent a3ef3cf
commit 8dcdd0c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradlebuild.patch-modules.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradlebuild.patch-modules.gradle.kts
@@ -97,6 +97,11 @@ extraJavaModuleInfo {
         requireAllDefinedDependencies()
         requires("java.logging")
     }
+    module("com.google.protobuf:protobuf-javalite", "com.google.protobuf") {
+        exportAllPackages()
+        requireAllDefinedDependencies()
+        requires("java.logging")
+    }
     module("io.grpc:grpc-netty-shaded", "grpc.netty.shaded")
     module("io.grpc:grpc-protobuf-lite", "grpc.protobuf.lite")
     module("io.grpc:grpc-protobuf", "grpc.protobuf")

diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradlebuild.sdk.full-variant.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradlebuild.sdk.full-variant.gradle.kts
@@ -34,11 +34,15 @@ protobuf.generateProtoTasks {
     }
 }
 
-val protobufVariant = if (publishFull) "protobuf-java" else "protobuf-javalite"
-extraJavaModuleInfo.module("com.google.protobuf:$protobufVariant", "com.google.protobuf") {
-    exportAllPackages()
-    requireAllDefinedDependencies()
-    requires("java.logging")
+if (publishFull) {
+    extraJavaModuleInfo {
+        module("com.google.protobuf:protobuf-javalite", "com.google.protobuf.UNUSED")
+        module("com.google.protobuf:protobuf-java", "com.google.protobuf") {
+            exportAllPackages()
+            requireAllDefinedDependencies()
+            requires("java.logging")
+        }
+    }
 }
 
 publishing.publications.named<MavenPublication>("mavenJava") {