From eb8662665b18703a95781ff5a8668df31acaff09 Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Thu, 23 Apr 2026 15:07:45 -0400 Subject: [PATCH] Update to Gradle 9.4.1 --- .github/workflows/functionalTest.yml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../spotlight/functionaltest/SpotlightSyncFunctionalTest.kt | 2 +- .../spotlight/functionaltest/fixtures/GradleProject.kt | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/functionalTest.yml b/.github/workflows/functionalTest.yml index 8ba48740..5684b95b 100644 --- a/.github/workflows/functionalTest.yml +++ b/.github/workflows/functionalTest.yml @@ -19,7 +19,7 @@ jobs: gradle_version: - 8.8 - 8.14.2 - - 9.2.1 + - 9.4.1 runs-on: ubuntu-latest permissions: contents: read diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b..c61a118f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/SpotlightSyncFunctionalTest.kt b/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/SpotlightSyncFunctionalTest.kt index e988a8dc..3764bfac 100644 --- a/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/SpotlightSyncFunctionalTest.kt +++ b/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/SpotlightSyncFunctionalTest.kt @@ -218,4 +218,4 @@ class SpotlightSyncFunctionalTest { assertThat(syncResult2.configurationCacheReused).isFalse() assertThat(syncResult2.configurationCacheStored).isTrue() } -} \ No newline at end of file +} diff --git a/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/fixtures/GradleProject.kt b/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/fixtures/GradleProject.kt index 63bd5fa5..ae83fc76 100644 --- a/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/fixtures/GradleProject.kt +++ b/spotlight-gradle-plugin/src/functionalTest/kotlin/com/fueledbycaffeine/spotlight/functionaltest/fixtures/GradleProject.kt @@ -53,7 +53,10 @@ fun GradleProject.sync(gradleVersion: GradleVersion): SyncResult = .setStandardOutput(stdout) .setStandardError(stderr) .addArguments("--info") - .addJvmArguments("-Didea.sync.active=true") + .addJvmArguments( + "-Didea.sync.active=true", + "-Dorg.gradle.internal.isolated-projects.caching=tooling", + ) .get() stdout.close() stderr.close()