diff --git a/gradle/modules.properties b/gradle/modules.properties index 5d669b4b..aa35f5e9 100644 --- a/gradle/modules.properties +++ b/gradle/modules.properties @@ -1 +1,5 @@ -com.google.auth.oauth2=com.google.auth:google-auth-library-oauth2-http \ No newline at end of file +# Jars that are not yet modules used in the 'tools' project +com.google.api.gax=com.google.api:gax +com.google.auth.oauth2=com.google.auth:google-auth-library-oauth2-http +com.google.cloud.core=com.google.cloud:google-cloud-core +com.google.cloud.storage=com.google.cloud:google-cloud-storage diff --git a/tools/build.gradle.kts b/tools/build.gradle.kts index e57956d7..bfa5d329 100644 --- a/tools/build.gradle.kts +++ b/tools/build.gradle.kts @@ -10,18 +10,20 @@ description = "Hedera Block Stream Tools" application { mainClass = "com.hedera.block.tools.BlockStreamTool" } -// Allow non-module Jar +// Allow non-module Jars extraJavaModuleInfo { failOnMissingModuleInfo = false failOnAutomaticModules = false } mainModuleInfo { - // depend on peer streams gradle module to get access to protobuf generated classes - requires("com.hedera.block.stream") + requires("com.hedera.block.stream") // use streams module to access protobuf generated classes requires("com.hedera.pbj.runtime") requires("com.github.luben.zstd_jni") + requires("com.google.api.gax") requires("com.google.auth.oauth2") + requires("com.google.cloud.core") + requires("com.google.cloud.storage") requires("com.google.gson") requires("info.picocli") runtimeOnly("com.swirlds.config.impl") @@ -31,12 +33,6 @@ mainModuleInfo { testModuleInfo { requiresStatic("com.github.spotbugs.annotations") } -dependencies { - implementation("com.google.api:gax") - implementation("com.google.cloud:google-cloud-core") - implementation("com.google.cloud:google-cloud-storage") -} - // == Shadow plugin configuration == tasks.shadowJar { // Generate Manifest with Main-Class and Implementation-Title