Merge pull request #35 from project-tsurugi/fix-distribution-name

build: fix distribution archive name.
project-tsurugi · Dec 26, 2023 · 5fd30a6 · 5fd30a6
2 parents b3cdcd0 + 366e4d3
commit 5fd30a6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/buildSrc/src/main/groovy/tanzawa.java-conventions.gradle b/buildSrc/src/main/groovy/tanzawa.java-conventions.gradle
@@ -108,3 +108,8 @@ task writeVersion(type: WriteProperties) {
 
 sourceSets.main.output.dir("${project.buildDir}/generated/version")
 processResources.dependsOn writeVersion
+
+tasks.withType(Tar) { task ->
+    task.archiveExtension = 'tar.gz'
+    task.compression = Compression.GZIP
+}
diff --git a/modules/tgdump/cli/build.gradle b/modules/tgdump/cli/build.gradle
@@ -23,6 +23,16 @@ dependencies {
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
 }
 
+distributions {
+    main {
+        distributionBaseName = 'tgdump'
+    }
+    shadow {
+        distributionBaseName = 'tgdump'
+        distributionClassifier = 'shadow'
+    }
+}
+
 application {
     applicationName = 'tgdump'
     mainClass = 'com.tsurugidb.tools.tgdump.cli.Main'
@@ -39,16 +49,6 @@ shadowJar {
     mergeServiceFiles()
 }
 
-distZip {
-    archiveFileName = "tgdump.zip"
-}
-
-distTar {
-    archiveFileName = "tgdump.tar.gz"
-    archiveExtension = 'tar.gz'
-    compression = Compression.GZIP
-}
-
 test {
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('test.logLevel') ?: 'debug'
 }
diff --git a/modules/tgsql/cli/build.gradle b/modules/tgsql/cli/build.gradle
@@ -23,6 +23,16 @@ dependencies {
     testImplementation 'org.slf4j:slf4j-simple:1.7.36'
 }
 
+distributions {
+    main {
+        distributionBaseName = 'tgsql'
+    }
+    shadow {
+        distributionBaseName = 'tgsql'
+        distributionClassifier = 'shadow'
+    }
+}
+
 application {
     applicationName = 'tgsql'
     mainClass = 'com.tsurugidb.console.cli.Main'
@@ -40,13 +50,3 @@ shadowJar {
     archiveClassifier = 'all'
     mergeServiceFiles()
 }
-
-distZip {
-    archiveFileName = "tgsql.zip"
-}
-
-distTar {
-    archiveFileName = "tgsql.tar.gz"
-    archiveExtension = 'tar.gz'
-    compression = Compression.GZIP
-}