Merge pull request #1978 from gradle/gk/gradle9

Upgraded to Gradle 9 in samples and fixed the failures

Author: ribafish

.github/workflows/convention-develocity-gradle-plugin-verification.yml

@@ -72,7 +72,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JDK 8
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.versions.java }}

.github/workflows/convention-develocity-shared-verification.yml

@@ -58,19 +58,24 @@ jobs:
           - sample: '6.9_and_later'
             version: '8.0.2'
             java: '17'
+          - sample: '6.9_and_later'
+            version: '9.0.0'
+            java: '21'
           - sample: '6.9_and_later'
             version: '(Current)'
             java: '21'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JDK 8
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.versions.java }}
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: ${{ matrix.versions.version != '(Current)' && matrix.versions.version || 'wrapper' }}
       - name: Download plugin
         uses: actions/download-artifact@v4
         with:
@@ -81,8 +86,8 @@ jobs:
         working-directory: convention-develocity-shared/examples/gradle_${{ matrix.versions.sample }}
         run: |
           sed -i '/distributionSha256Sum.*/d' gradle/wrapper/gradle-wrapper.properties
-          ./gradlew wrapper --gradle-version=${{ matrix.versions.version }} --no-scan
-          ./gradlew wrapper --gradle-version=${{ matrix.versions.version }} --no-scan
+          gradle wrapper --gradle-version=${{ matrix.versions.version }} --no-scan
+          gradle wrapper --gradle-version=${{ matrix.versions.version }} --no-scan
       - name: Verify example build
         id: build
         working-directory: convention-develocity-shared/examples/gradle_${{ matrix.versions.sample }}

build-data-capturing-gradle-samples/capture-quality-check-issues/gradle-quality-check-issues.gradle

@@ -3,6 +3,8 @@
  * and adds these as custom values.
  */
 
+import groovy.xml.XmlSlurper;
+
 def develocityApi = project.extensions.findByName('develocity')
 if (!develocityApi) {
     return

build-data-capturing-gradle-samples/capture-quality-check-issues/gradle-quality-check-issues.gradle.kts

@@ -37,7 +37,7 @@ project.extensions.configure<DevelocityConfiguration>() {
                         val files = report.getProperty("file") as NodeChildren
                         files.forEach { f ->
                             val file = f as NodeChild
-                            val filePath = project.rootProject.relativePath(file.attributes()["name"])
+                            val filePath = project.rootProject.relativePath(file.attributes()["name"]!!)
                             val checkErrors = file.getProperty("error") as NodeChildren
                             checkErrors.forEach { e ->
                                 val error = e as NodeChild

convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/gradlew

@@ -14,6 +14,7 @@
 import org.gradle.util.GradleVersion;
 
 import javax.inject.Inject;
+import java.lang.reflect.Method;
 import java.util.Optional;
 
 /**
@@ -97,7 +98,7 @@ private boolean isCi() {
     // versions in order to detect changes when configuration cache is enabled.
     private Optional<String> environmentVariable(String name) {
         if (isGradle65OrNewer() && !isGradle74OrNewer()) {
-            @SuppressWarnings("deprecation") Provider<String> variable = providers.environmentVariable(name).forUseAtConfigurationTime();
+            Provider<String> variable = forUseAtConfigurationTime(providers.environmentVariable(name));
             return Optional.ofNullable(variable.getOrNull());
         }
         return Optional.ofNullable(System.getenv(name));
@@ -119,4 +120,18 @@ private static boolean isGradle5OrNewer() {
         return GradleVersion.current().compareTo(GradleVersion.version("5.0")) >= 0;
     }
 
+    private static Provider<String> forUseAtConfigurationTime(Provider<String> provider) {
+        if (isGradle65OrNewer() && !isGradle74OrNewer()) {
+            try {
+                // Use reflection to access the forUseAtConfigurationTime method as it was removed in Gradle 9.
+                Method method = Provider.class.getMethod("forUseAtConfigurationTime");
+                return (Provider<String>) method.invoke(provider);
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to invoke forUseAtConfigurationTime via reflection", e);
+            }
+        } else {
+            return provider;
+        }
+    }
+
 }

convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/src/main/java/com/myorg/ConventionDevelocityGradlePlugin.java

@@ -4,6 +4,7 @@
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.util.GradleVersion;
 
+import java.lang.reflect.Method;
 import java.util.Optional;
 
 public final class GradleExecutionContext implements ExecutionContext {
@@ -19,7 +20,7 @@ public GradleExecutionContext(ProviderFactory providers) {
     @Override
     public Optional<String> environmentVariable(String name) {
         if (isGradle65OrNewer() && !isGradle74OrNewer()) {
-            @SuppressWarnings("deprecation") Provider<String> variable = providers.environmentVariable(name).forUseAtConfigurationTime();
+            Provider<String> variable = forUseAtConfigurationTime(providers.environmentVariable(name));
             return Optional.ofNullable(variable.getOrNull());
         }
         return Optional.ofNullable(System.getenv(name));
@@ -30,7 +31,7 @@ public Optional<String> environmentVariable(String name) {
     @Override
     public Optional<String> systemProperty(String name) {
         if (isGradle65OrNewer() && !isGradle74OrNewer()) {
-            @SuppressWarnings("deprecation") Provider<String> property = providers.systemProperty(name).forUseAtConfigurationTime();
+            Provider<String> property = forUseAtConfigurationTime(providers.systemProperty(name));
             return Optional.ofNullable(property.getOrNull());
         }
         return Optional.ofNullable(System.getProperty(name));
@@ -45,4 +46,18 @@ private static boolean isGradle74OrNewer() {
         return GradleVersion.current().compareTo(GradleVersion.version("7.4")) >= 0;
     }
 
+    private static Provider<String> forUseAtConfigurationTime(Provider<String> provider) {
+        if (isGradle65OrNewer() && !isGradle74OrNewer()) {
+            try {
+                // Use reflection to access the forUseAtConfigurationTime method as it was removed in Gradle 9.
+                Method method = Provider.class.getMethod("forUseAtConfigurationTime");
+                return (Provider<String>) method.invoke(provider);
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to invoke forUseAtConfigurationTime via reflection", e);
+            }
+        } else {
+            return provider;
+        }
+    }
+
 }