build: AGP 9.4.1 and Gradle 9.6.0

.github/workflows/npm_release.yml

@@ -169,9 +169,6 @@ jobs:
           key: ccache-test-${{ github.sha }}
           restore-keys: ccache-test-
       - name: Configure build caches
-        # no org.gradle.caching here: the SBG AST tests spawn nested `gradlew -b`
-        # builds that fail with "Build cache controller already set" when the
-        # build cache is on
         run: |
           command -v ccache || sudo apt-get install -y ccache
           ccache --version
@@ -181,7 +178,7 @@ jobs:
           # identification (the default) would invalidate the whole cache
           echo "CCACHE_COMPILERCHECK=content" >> $GITHUB_ENV
           mkdir -p ~/.gradle
-          printf 'org.gradle.parallel=true\n' >> ~/.gradle/gradle.properties
+          printf 'org.gradle.parallel=true\norg.gradle.caching=true\n' >> ~/.gradle/gradle.properties
       - name: Install Dependencies
         run: |
           npm install

.github/workflows/pull_request.yml

@@ -141,9 +141,6 @@ jobs:
           key: ccache-test-${{ github.sha }}
           restore-keys: ccache-test-
       - name: Configure build caches
-        # no org.gradle.caching here: the SBG AST tests spawn nested `gradlew -b`
-        # builds that fail with "Build cache controller already set" when the
-        # build cache is on
         run: |
           command -v ccache || sudo apt-get install -y ccache
           ccache --version
@@ -153,7 +150,7 @@ jobs:
           # identification (the default) would invalidate the whole cache
           echo "CCACHE_COMPILERCHECK=content" >> $GITHUB_ENV
           mkdir -p ~/.gradle
-          printf 'org.gradle.parallel=true\n' >> ~/.gradle/gradle.properties
+          printf 'org.gradle.parallel=true\norg.gradle.caching=true\n' >> ~/.gradle/gradle.properties
       - name: Install Dependencies
         run: |
           npm install

build.gradle

@@ -71,19 +71,18 @@ task createDistDir {
 
 def getCCacheVersion = { ->
     try {
-        def ccacheVersionOutput = new ByteArrayOutputStream()
-        exec {
+        return providers.exec {
             commandLine "ccache", "--version"
-            standardOutput = ccacheVersionOutput
-        }
-
-        return ccacheVersionOutput.toString().trim()
+        }.standardOutput.asText.get().trim()
     } catch (all) {
         return 'CCache not found!'
     }
 }
 
 task getPackageVersion {
+    def packageVersion = findProperty("packageVersion")
+    def preReleaseVersion = findProperty("preReleaseVersion")
+
     doLast {
         String content = new File("$rootDir/package.json").getText("UTF-8")
         def jsonSlurper = new JsonSlurper()
@@ -93,14 +92,14 @@ task getPackageVersion {
 
         println "Using runtime version from package.json '${pVersion}'"
 
-        if (project.hasProperty("packageVersion") && packageVersion != "") {
+        if (packageVersion != null && packageVersion != "") {
             pVersion += "-" + packageVersion
 
             println "Using packageVersion property '${pVersion}'"
         }
 
 
-        if (project.hasProperty("preReleaseVersion")) {
+        if (preReleaseVersion != null) {
             pVersion += "-" + preReleaseVersion
 
             println "Adding preReleaseVersion property '${pVersion}' to package version"
@@ -115,8 +114,10 @@ task getPackageVersion {
 }
 
 task getCommitVersion {
+    def gitCommitVersion = findProperty("gitCommitVersion")
+
     doLast {
-        if (project.hasProperty("gitCommitVersion")) {
+        if (gitCommitVersion != null) {
             println "Using commit version property " + gitCommitVersion
             arVersion = gitCommitVersion
         } else if ("$System.env.GIT_COMMIT" != "null") {
@@ -461,7 +462,7 @@ def getRunTestsBuildArguments = { taskName ->
     } else {
         arguments.add("./gradlew")
     }
-    arguments += ["-b", "runtests.gradle", taskName]
+    arguments += ["-p", "runtests", taskName]
     if (onlyX86) {
         arguments.add("-PonlyX86")
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 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-9.6.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists