Skip to content

Commit

Permalink
build: consistently use Module Name dependency notation
Browse files Browse the repository at this point in the history
Signed-off-by: Jendrik Johannes <[email protected]>
  • Loading branch information
jjohannes committed Jan 9, 2025
1 parent 5f390f3 commit 73ab847
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 5 additions & 1 deletion gradle/modules.properties
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
com.google.auth.oauth2=com.google.auth:google-auth-library-oauth2-http
# 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
14 changes: 5 additions & 9 deletions tools/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down

0 comments on commit 73ab847

Please sign in to comment.