From 893f44cf785997d0b5e64486e420711adbb76614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Sun, 19 Dec 2021 00:37:39 +0100 Subject: [PATCH] update to Gradle 7.3.2 --- gradle.properties | 2 +- gradle/compile/groovy.gradle | 10 ++++++++-- gradle/compile/java.gradle | 7 +++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index e960a4c..511b72c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 0.0.2 org.gradle.warning.mode = ALL groovy.version = 2.5.12 -gradle.wrapper.version = 7.3 +gradle.wrapper.version = 7.3.2 files.version = 3.0.0 ftp.version = 2.6.0 mail.version = 1.6.2 diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle index c70f6b9..b48d5cc 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -21,7 +21,13 @@ tasks.withType(GroovyCompile) { } } -task groovydocJar(type: Jar, dependsOn: 'groovydoc') { +task groovydocJar(type: Jar) { + dependsOn groovydoc from groovydoc.destinationDir - archiveClassifier.set('javadoc') + archiveClassifier.set('groovydoc') +} +tasks.assemble.dependsOn(tasks.groovydocJar) + +artifacts { + archives groovydocJar } diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index c9bba7f..7c834af 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -21,13 +21,16 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { +task sourcesJar(type: Jar) { + dependsOn classes classifier 'sources' from sourceSets.main.allSource } -task javadocJar(type: Jar, dependsOn: javadoc) { +task javadocJar(type: Jar) { + dependsOn javadoc classifier 'javadoc' + from javadoc.destinationDir } artifacts { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbce071..ac0b842 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists