From bb07589eae0b3195a589559a3245cbc12c29b394 Mon Sep 17 00:00:00 2001
From: Daniel Chao <dan.chao@apple.com>
Date: Fri, 5 Jun 2026 14:17:06 -0700
Subject: [PATCH] Fix gradle configuration cache issues for
 gradle-compatibility (#1658)

---
 .../main/kotlin/pklGradlePluginTest.gradle.kts   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build-logic/src/main/kotlin/pklGradlePluginTest.gradle.kts b/build-logic/src/main/kotlin/pklGradlePluginTest.gradle.kts
index 5de3573c3..730e76ad7 100644
--- a/build-logic/src/main/kotlin/pklGradlePluginTest.gradle.kts
+++ b/build-logic/src/main/kotlin/pklGradlePluginTest.gradle.kts
@@ -93,21 +93,29 @@ fun createCompatibilityTestTask(versionInfo: GradleVersionInfo): TaskProvider<Te
   createCompatibilityTestTask(versionInfo.version, versionInfo.downloadUrl)
 
 fun createCompatibilityTestTask(version: String, downloadUrl: String): TaskProvider<Test> {
+  val currentGradleVersion = gradle.gradleVersion
   return tasks.register("compatibilityTest$version", Test::class.java) {
     mustRunAfter(tasks.test)
 
-    maxHeapSize = tasks.test.get().maxHeapSize
-    jvmArgs = tasks.test.get().jvmArgs
-    classpath = tasks.test.get().classpath
+    val myMaxHeapSize = tasks.test.map { it.maxHeapSize }
+    val myJvmArgs = tasks.test.map { it.jvmArgs }
+    val myClasspath = tasks.test.map { it.classpath }
+
     systemProperty("testGradleVersion", version)
     systemProperty("testGradleDistributionUrl", downloadUrl)
 
     doFirst {
-      if (version == gradle.gradleVersion && gradle.taskGraph.hasTask(tasks.test.get())) {
+      if (
+        version == currentGradleVersion &&
+          project.gradle.taskGraph.hasTask(project.tasks.getByName("test"))
+      ) {
         // don't test same version twice
         println("This version has already been tested by the `test` task.")
         throw StopExecutionException()
       }
+      maxHeapSize = myMaxHeapSize.get()
+      jvmArgs = myJvmArgs.get()
+      classpath = myClasspath.get()
     }
   }
 }