From 996989ed1cfbdff39d469312465c8e78c53d5796 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:47:43 +0000
Subject: [PATCH 1/2] Update Gradle to v9.6.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 4 ++--
 gradlew.bat                              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df6a6ad763..a9db11550c 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.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/gradlew b/gradlew
index b9bb139f79..249efbb032 100755
--- a/gradlew
+++ b/gradlew
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
diff --git a/gradlew.bat b/gradlew.bat
index aa5f10b069..8508ef684d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -19,7 +19,7 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
@@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2
 
 
 
-@rem Execute Gradle
+@rem Execute gradlew
 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded
 @rem which allows us to clear the local environment before executing the java command
 endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel

From 1e1f980331974559846436e6df4a2ca9e1f9158a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= <benoit@quenaudon.com>
Date: Mon, 29 Jun 2026 12:50:10 +0100
Subject: [PATCH 2/2] Bump AGP

---
 .../build.gradle                              |  2 +-
 .../gradle.properties                         |  2 +
 .../build.gradle                              | 38 +------------------
 .../library/build.gradle                      | 35 +++++++++++++++++
 .../settings.gradle                           |  2 +
 5 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/gradle.properties
 create mode 100644 wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/library/build.gradle

diff --git a/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/build.gradle b/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/build.gradle
index 55e4937fad..d6423f8550 100644
--- a/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/build.gradle
+++ b/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
   dependencies {
     classpath("com.squareup.wire:wire-gradle-plugin:${wireVersion}")
-    classpath("com.android.tools.build:gradle:8.13.2")
+    classpath("com.android.tools.build:gradle:9.2.1")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21")
     classpath("com.google.devtools.ksp:symbol-processing-gradle-plugin:2.2.21-2.0.5")
   }
diff --git a/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/gradle.properties b/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/gradle.properties
new file mode 100644
index 0000000000..63ae174737
--- /dev/null
+++ b/wire-gradle-plugin/src/test/projects/android-kotlin-ksp-source-set/gradle.properties
@@ -0,0 +1,2 @@
+android.builtInKotlin=false
+android.newDsl=false
diff --git a/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/build.gradle b/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/build.gradle
index a33e81baf0..412359f308 100644
--- a/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/build.gradle
+++ b/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/build.gradle
@@ -1,37 +1,3 @@
-def wireVersion = gradle.startParameter.projectProperties.get('wireVersion')
-
-buildscript {
-  repositories {
-    maven {
-      url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
-    }
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("com.squareup.wire:wire-gradle-plugin:${wireVersion}")
-    classpath("com.android.tools.build:gradle:8.13.2")
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21")
-  }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'com.squareup.wire'
-apply plugin: 'maven-publish'
-
-android {
-  namespace = "com.example.producer"
-  compileSdk = 36
-
-  publishing {
-    singleVariant('release') {
-      withSourcesJar()
-    }
-  }
-}
-
-wire {
-  kotlin {}
+tasks.register('sourceReleaseJar') {
+  dependsOn ':library:sourceReleaseJar'
 }
diff --git a/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/library/build.gradle b/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/library/build.gradle
new file mode 100644
index 0000000000..b4206e33fd
--- /dev/null
+++ b/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/library/build.gradle
@@ -0,0 +1,35 @@
+def wireVersion = gradle.startParameter.projectProperties.get('wireVersion')
+
+buildscript {
+  repositories {
+    maven {
+      url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
+    }
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath("com.squareup.wire:wire-gradle-plugin:${wireVersion}")
+    classpath("com.android.tools.build:gradle:9.2.1")
+  }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'com.squareup.wire'
+apply plugin: 'maven-publish'
+
+android {
+  namespace = "com.example.producer"
+  compileSdk = 36
+
+  publishing {
+    singleVariant('release') {
+      withSourcesJar()
+    }
+  }
+}
+
+wire {
+  kotlin {}
+}
diff --git a/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/settings.gradle b/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/settings.gradle
index d2477a3675..0fa11f9537 100644
--- a/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/settings.gradle
+++ b/wire-gradle-plugin/src/test/projects/android-kotlin-source-release-jar/settings.gradle
@@ -20,3 +20,5 @@ dependencyResolutionManagement {
     mavenCentral()
   }
 }
+
+include ':library'