feat: refactored dist build code.

Author: jrfaller

buildSrc/build.gradle

@@ -1,3 +1,11 @@
 plugins {
     id 'groovy-gradle-plugin'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.1.0")
 }

buildSrc/src/main/groovy/java-dist-conv.gradle

@@ -0,0 +1,34 @@
+plugins {
+    id 'java-conv'
+    id 'com.gradleup.shadow'
+    id 'application'
+}
+
+shadowJar {
+    archiveBaseName.set('gumtree')
+    archiveClassifier.set('')
+    archiveVersion.set('')
+    mergeServiceFiles()
+    mergeServiceFiles {
+        path = 'META-INF/annotations'
+    }
+}
+
+application {
+    mainClass = 'com.github.gumtreediff.client.Run'
+    applicationName = 'gumtree'
+}
+
+tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
+    archiveBaseName.set('gumtree')
+}
+
+shadowDistZip.enabled = true
+distTar.enabled = false
+distZip.enabled = false
+startScripts.enabled = false
+shadowDistTar.enabled = false
+
+jar.enabled = false
+
+build.finalizedBy installShadowDist

dist-minimal/build.gradle

@@ -1,7 +1,5 @@
 plugins {
-	id 'java-conv'
-	id 'com.gradleup.shadow' version '9.0.0-rc3'
-	id 'application'
+	id 'java-dist-conv'
 }
 
 description = 'GumTree minimal distribution.'
@@ -16,39 +14,4 @@ dependencies {
 	implementation project(':gen.xml')
 	implementation project(':gen.yaml')
 	implementation project(':gen.json')
-}
-
-shadowJar {
-	archiveBaseName.set('gumtree')
-	archiveClassifier.set('')
-	archiveVersion.set('')
-	mergeServiceFiles()
-	mergeServiceFiles {
-		path = 'META-INF/annotations'
-	}
-}
-
-distributions {
-	shadow {
-		distributionBaseName = 'gumtree'
-	}
-}
-
-application {
-	mainClass = 'com.github.gumtreediff.client.Run'
-	applicationName = 'gumtree'
-}
-
-tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-	archiveBaseName.set('gumtree')
-}
-
-shadowDistZip.enabled = true
-distTar.enabled = false
-distZip.enabled = false
-startScripts.enabled = false
-shadowDistTar.enabled = false
-
-jar.enabled = false
-
-build.finalizedBy installShadowDist
+}

dist/build.gradle

@@ -1,7 +1,5 @@
 plugins {
-	id 'java-conv'
-	id 'com.gradleup.shadow' version '9.0.0-rc3'
-	id 'application'
+	id 'java-dist-conv'
 }
 
 description = 'GumTree distribution.'
@@ -19,38 +17,3 @@ dependencies {
 	implementation project(':gen.xml')
 	implementation project(':gen.yaml')
 }
-
-shadowJar {
-	archiveBaseName.set('gumtree')
-	archiveClassifier.set('')
-	archiveVersion.set('')
-	mergeServiceFiles()
-	mergeServiceFiles {
-		path = 'META-INF/annotations'
-	}
-}
-
-distributions {
-	shadow {
-		distributionBaseName = 'gumtree'
-	}
-}
-
-application {
-	mainClass = 'com.github.gumtreediff.client.Run'
-	applicationName = 'gumtree'
-}
-
-tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-	archiveBaseName.set('gumtree')
-}
-
-shadowDistZip.enabled = true
-distTar.enabled = false
-distZip.enabled = false
-startScripts.enabled = false
-shadowDistTar.enabled = false
-
-jar.enabled = false
-
-build.finalizedBy installShadowDist

docker/Dockerfile

@@ -28,7 +28,7 @@ ENV TZ=GMT
 ENV LANG=C.UTF-8
 
 # Copy gumtree distribution from build-stage.
-COPY --from=build-stage /opt/gumtree/dist/build/install/gumtree/ /opt/gumtree
+COPY --from=build-stage /opt/gumtree/dist/build/install/dist-shadow/ /opt/gumtree
 # Copy srcml package from build-stage.
 COPY --from=build-stage /*.deb /opt