Fix Gradle task dependencies

antville · May 18, 2024 · bd2c103 · bd2c103
1 parent d0e11b5
commit bd2c103
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -129,6 +129,7 @@ application {
 
 distTar {
   dependsOn ':generateLicenseReport', ':javadoc', ':jsdoc'
+
   compression = Compression.GZIP
 
   filesMatching(textFiles) {

diff --git a/modules/helma/build.gradle b/modules/helma/build.gradle
@@ -5,6 +5,13 @@ dependencies {
 	runtimeOnly 'org.apache.lucene:lucene-core:2.2.0'
 }
 
+jar.enabled = false
+compileJava.enabled = false
+compileTestJava.enabled = false
+processResources.enabled = false
+processTestResources.enabled = false
+test.enabled = false
+
 task deps(type: Copy) {
 	from sourceSets.main.runtimeClasspath
 	into '.'

diff --git a/modules/jala/build.gradle b/modules/jala/build.gradle
@@ -8,6 +8,13 @@ dependencies {
 	//runtime 'javadns:org.wonderly:?'
 }
 
+jar.enabled = false
+compileJava.enabled = false
+compileTestJava.enabled = false
+processResources.enabled = false
+processTestResources.enabled = false
+test.enabled = false
+
 task deps(type: Copy) {
 	from sourceSets.main.runtimeClasspath
 	into 'lib'

diff --git a/modules/jala/util/HopKit/build.gradle b/modules/jala/util/HopKit/build.gradle
@@ -3,6 +3,13 @@ dependencies {
 	runtimeOnly 'bsf:bsf:2.4.0'
 }
 
+jar.enabled = false
+compileJava.enabled = false
+compileTestJava.enabled = false
+processResources.enabled = false
+processTestResources.enabled = false
+test.enabled = false
+
 task deps(type: Copy) {
 	from sourceSets.main.runtimeClasspath
 	into 'lib'

diff --git a/modules/jala/util/Test/build.gradle b/modules/jala/util/Test/build.gradle
@@ -3,6 +3,13 @@ dependencies {
 	runtimeOnly 'org.subethamail:subethasmtp-wiser:1.2'
 }
 
+jar.enabled = false
+compileJava.enabled = false
+compileTestJava.enabled = false
+processResources.enabled = false
+processTestResources.enabled = false
+test.enabled = false
+
 task deps(type: Copy) {
 	from sourceSets.main.runtimeClasspath
 	into 'code'

diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,12 @@ org.apache.tools.ant.DirectoryScanner.removeDefaultExclude('**/.git/**')
 org.apache.tools.ant.DirectoryScanner.removeDefaultExclude('**/.gitignore')
 
 include 'launcher'
-include 'modules:helma'
-include 'modules:jala'
-include 'modules:jala:util:HopKit'
-include 'modules:jala:util:Test'
+include 'modules'
+include 'jala'
+include 'hopKit'
+include 'test'
+
+project(':modules').projectDir = file('modules/helma')
+project(':jala').projectDir = file('modules/jala')
+project(':hopKit').projectDir = file('modules/jala/util/HopKit')
+project(':test').projectDir = file('modules/jala/util/Test')