Bump Gradle 8.4 and test vs Java 21 (#4450)

Signed-off-by: Paolo Di Tommaso <[email protected]>

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 17, 19]
+        java_version: [11, 17, 21]
 
     steps:
       - name: Environment
@@ -98,7 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 19]
+        java_version: [11, 21]
         test_mode: ["test_integration", "test_aws", "test_azure", "test_google", "test_wave"]
     steps:
       - name: Checkout

build.gradle

@@ -299,12 +299,12 @@ configure(coreProjects) {
     apply plugin: 'signing'
 
     task javadocJar(type: Jar) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from configurations.groovyDoc
     }
 
     task sourcesJar(type: Jar) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from sourceSets.main.allSource
     }
 

buildSrc/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'groovy-gradle-plugin'
-    id "com.gradle.plugin-publish" version "0.12.0"
+    id "com.gradle.plugin-publish" version "1.2.1"
 }
 
 repositories {
@@ -16,24 +16,17 @@ dependencies {
 }
 
 gradlePlugin {
-    plugins {
-        nextflowPlugin {
-            id = 'io.nextflow.nf-build-plugin'
-            implementationClass = 'io.nextflow.gradle.NextflowBuildPlugin'
-        }
-    }
-}
-
-pluginBundle {
     website = 'https://www.nextflow.io/'
     vcsUrl = 'https://github.com/nextflow-io/nextflow'
     description = 'Helper plugin for Nextflow project build'
-    tags = ['nextflow']
-
+
     plugins {
-        nextflowPlugin {
+        create("nextflowPlugin") {
+            id = 'io.nextflow.nf-build-plugin'
+            implementationClass = 'io.nextflow.gradle.NextflowBuildPlugin'
             // id is captured from java-gradle-plugin configuration
             displayName = 'Nextflow Build plugin'
         }
     }
 }
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packing.gradle

@@ -98,7 +98,7 @@ protected coordinates( it ) {
  */
 task packOne(type: Jar) {
     dependsOn configurations.capsule, configurations.defaultCfg
-    archiveName = "nextflow-${version}-one.jar"
+    archiveFileName = "nextflow-${version}-one.jar"
 
     from (configurations.capsule.collect { zipTree(it) })
 
@@ -133,7 +133,7 @@ task packOne(type: Jar) {
 
 task packAll(type: Jar) {
     dependsOn configurations.capsule, configurations.defaultCfg
-    archiveName = "nextflow-${version}-all.jar"
+    archiveFileName = "nextflow-${version}-all.jar"
 
     from jar // embed our application jar
     from (configurations.amazon + configurations.google + configurations.tower + configurations.wave)
@@ -175,7 +175,7 @@ task packAll(type: Jar) {
 
 task packCore(type: Jar) {
     dependsOn configurations.capsule, configurations.defaultCfg
-    archiveName = "nextflow-${version}-core.jar"
+    archiveFileName = "nextflow-${version}-core.jar"
 
     from jar // embed our application jar
     from (configurations.defaultCfg)

settings.gradle

@@ -14,6 +14,13 @@
  * limitations under the License.
  */
 
+plugins {
+    // required to download the toolchain (jdk) from a remote repository
+    // https://github.com/gradle/foojay-toolchains
+    // https://docs.gradle.org/current/userguide/toolchains.html#sub:download_repositories
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+}
+
 rootProject.name = 'nextflow-prj'
 
 include 'nextflow'