Gradle 8.10-rc-1

Author: rpalcolea

.github/workflows/nebula.yml

@@ -22,25 +22,21 @@ jobs:
     strategy:
       matrix:
         # test against latest update of some major Java version(s), as well as specific LTS version(s)
-        java: [ 8, 17, 21]
+        java: [8, 17, 21]
     name: Gradle Build without Publish
     steps:
       - uses: actions/checkout@v1
       - name: Setup git user
         run: |
           git config --global user.name "Nebula Plugin Maintainers"
           git config --global user.email "[email protected]"
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDKs
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '8'
-          java-package: jdk
-      - name: Setup jdk
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: ${{ matrix.java }}
+          java-version: |
+            8
+            ${{ matrix.java }}
           java-package: jdk
       - uses: actions/cache@v1
         id: gradle-cache
@@ -74,10 +70,14 @@ jobs:
         run: |
           git config --global user.name "Nebula Plugin Maintainers"
           git config --global user.email "[email protected]"
-      - name: Setup jdk 8
-        uses: actions/setup-java@v1
+      - name: Set up JDKs
+        uses: actions/setup-java@v4
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: |
+            8
+            21
+          java-package: jdk
       - uses: actions/cache@v1
         id: gradle-cache
         with:
@@ -115,10 +115,14 @@ jobs:
         run: |
           git config --global user.name "Nebula Plugin Maintainers"
           git config --global user.email "[email protected]"
-      - name: Setup jdk 8
-        uses: actions/setup-java@v1
+      - name: Set up JDKs
+        uses: actions/setup-java@v4
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: |
+            8
+            21
+          java-package: jdk
       - uses: actions/cache@v1
         id: gradle-cache
         with:
@@ -143,4 +147,3 @@ jobs:
           startsWith(github.ref, 'refs/tags/v') &&
           (!contains(github.ref, '-rc.'))
         run: ./gradlew --info --stacktrace -Dgradle.publish.key=${{ secrets.gradlePublishKey }} -Dgradle.publish.secret=${{ secrets.gradlePublishSecret }} -Prelease.useLastTag=true final
-

build.gradle

@@ -25,7 +25,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '20.11.0'
+    id 'com.netflix.nebula.plugin-plugin' version '21.0.0'
     id "org.jetbrains.kotlin.jvm" version "1.8.0"
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'java-gradle-plugin'
@@ -157,15 +157,9 @@ java {
     }
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     maxHeapSize = '512m'
     maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(System.getenv("JDK_VERSION_FOR_TESTS")?.toInteger() ?: 8)
-    }
-    doFirst {
-        logger.lifecycle("Executing tests with JDK: ${System.getenv("JDK_VERSION_FOR_TESTS")?.toInteger() ?: 8}")
-    }
     testLogging {
         events "PASSED", "FAILED", "SKIPPED"
         afterSuite { desc, result ->
@@ -181,10 +175,10 @@ tasks.withType(Test) {
 
 // Kotlin compiles first, stubbing Java dependencies, however it can't stub Groovy and we need to call Groovy code from Kotlin. For details see:
 // https://discuss.gradle.org/t/kotlin-groovy-and-java-compilation/14903/10
-tasks.named('compileGroovy') {
+tasks.named('compileGroovy').configure {
     classpath = sourceSets.main.compileClasspath
 }
-tasks.named('compileKotlin') {
+tasks.named('compileKotlin').configure {
     classpath += files(sourceSets.main.groovy.classesDirectory)
 }
 

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1 @@
+toolchainVersion=21

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################