From e0fc8ea9bcec91f8074c29eea0b13efbb25b2e5d Mon Sep 17 00:00:00 2001
From: Inaki Villar <inaki.seri@gmail.com>
Date: Tue, 30 Sep 2025 14:12:50 -0700
Subject: [PATCH 1/2] Prepare for 3.0.2 release

---
 README.md                                              | 10 +++++-----
 release/changes.md                                     |  1 +
 .../android/workarounds/JdkImageWorkaround.groovy      |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a877598f..a5882c0d 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ This plugin should be applied anywhere the `com.android.application` or `com.and
 // in build.grade.kts for convention plugin build
 dependencies {
   // ...
-  implementation("org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:3.0.1")
+  implementation("org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:3.0.2")
   // ...
 }
 
@@ -65,7 +65,7 @@ plugins {
 // in build.grade for convention plugin build
 dependencies {
     // ...
-    implementation("org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:3.0.1")
+    implementation("org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:3.0.2")
     // ...
 }
 
@@ -79,7 +79,7 @@ plugins {
 
 </details>
 
-If you are not using convention plugins and would like a quick way of testing the plugin you can alternatively place it in the root project's build.gradle (change '3.0.1' to the latest version of the cache fix plugin
+If you are not using convention plugins and would like a quick way of testing the plugin you can alternatively place it in the root project's build.gradle (change '3.0.2' to the latest version of the cache fix plugin
 [here](https://plugins.gradle.org/plugin/org.gradle.android.cache-fix)). We discourage this approach because it uses [cross project configuration](https://docs.gradle.org/current/userguide/sharing_build_logic_between_subprojects.html#sec:convention_plugins_vs_cross_configuration).
 
 <details open>
@@ -88,7 +88,7 @@ If you are not using convention plugins and would like a quick way of testing th
 
 ```kotlin
 plugins {
-    id("org.gradle.android.cache-fix") version "3.0.1" apply false
+    id("org.gradle.android.cache-fix") version "3.0.2" apply false
 }
 
 subprojects {
@@ -105,7 +105,7 @@ subprojects {
 
 ```groovy
 plugins {
-    id "org.gradle.android.cache-fix" version "3.0.1" apply false
+    id "org.gradle.android.cache-fix" version "3.0.2" apply false
 }
 
 subprojects {
diff --git a/release/changes.md b/release/changes.md
index e69de29b..8437197c 100644
--- a/release/changes.md
+++ b/release/changes.md
@@ -0,0 +1 @@
+- [NEW] - JdkImageWorkaround: uses the Variant API on AGP ≥ 9.0.0-alpha06, falls back to legacy APIs on earlier versions
diff --git a/src/main/groovy/org/gradle/android/workarounds/JdkImageWorkaround.groovy b/src/main/groovy/org/gradle/android/workarounds/JdkImageWorkaround.groovy
index 6034354c..0523082e 100644
--- a/src/main/groovy/org/gradle/android/workarounds/JdkImageWorkaround.groovy
+++ b/src/main/groovy/org/gradle/android/workarounds/JdkImageWorkaround.groovy
@@ -61,7 +61,7 @@ class JdkImageWorkaround implements Workaround {
         // runtime configuration before querying (and instantiating) task configurations.
         applyRuntimeClasspathNormalization(project)
 
-        if (Versions.CURRENT_ANDROID_VERSION < VersionNumber.parse("9.0.0-alpha04")) {
+        if (Versions.CURRENT_ANDROID_VERSION < VersionNumber.parse("9.0.0-alpha06")) {
             applyToAllAndroidVariantsLegacy(project) { variant ->
                 variant.javaCompileProvider.configure { JavaCompile task ->
                     jdkTransform(project, task)

From f3c73b77b5065d35c95c1bd14f323fa487e77cee Mon Sep 17 00:00:00 2001
From: Inaki Villar <inaki.seri@gmail.com>
Date: Wed, 1 Oct 2025 09:04:12 -0700
Subject: [PATCH 2/2] removing redundant version reference

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a5882c0d..b95243ac 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,7 @@ plugins {
 
 </details>
 
-If you are not using convention plugins and would like a quick way of testing the plugin you can alternatively place it in the root project's build.gradle (change '3.0.2' to the latest version of the cache fix plugin
-[here](https://plugins.gradle.org/plugin/org.gradle.android.cache-fix)). We discourage this approach because it uses [cross project configuration](https://docs.gradle.org/current/userguide/sharing_build_logic_between_subprojects.html#sec:convention_plugins_vs_cross_configuration).
+If you are not using convention plugins and would like a quick way of testing the plugin you can alternatively place it in the root project's build.gradle. We discourage this approach because it uses [cross project configuration](https://docs.gradle.org/current/userguide/sharing_build_logic_between_subprojects.html#sec:convention_plugins_vs_cross_configuration).
 
 <details open>
 <summary>Kotlin</summary>