Remove android.disallowKotlinSourceSets=false

app/build.gradle.kts

@@ -87,12 +87,6 @@ val selectableVariants = listOf(
   "githubProdRelease"
 )
 
-// Wire 5.x iterates Android source sets and expects matching Kotlin source sets.
-// AGP 9.0's built-in Kotlin doesn't create all source sets automatically.
-val kotlinExt = extensions.getByName("kotlin") as KotlinAndroidProjectExtension
-android.sourceSets.all {
-  kotlinExt.sourceSets.findByName(name) ?: kotlinExt.sourceSets.create(name)
-}
 // AGP 9.0's built-in Kotlin doesn't pick up extra java.srcDir entries from Android
 // source sets, so add shared dirs directly to the relevant Kotlin compile tasks.
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {

gradle.properties

@@ -20,9 +20,6 @@ org.gradle.java.installations.auto-download=false
 
 # Required: Kotlin source files exist under src/testFixtures (e.g. core/ui).
 android.experimental.enableTestFixturesKotlinSupport=true
-# Required: app/build.gradle.kts uses kotlinExt.sourceSets.create(...) to wire Kotlin
-# source sets for Wire 5.x, which AGP 9.0's built-in Kotlin doesn't create automatically.
-android.disallowKotlinSourceSets=false
 
 # Uncomment these to build libsignal from source.
 # libsignalClientPath=../libsignal

gradle/libs.versions.toml

@@ -161,7 +161,7 @@ google-ez-vcard = "com.googlecode.ez-vcard:ez-vcard:0.9.11"
 google-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
 google-guava-android = "com.google.guava:guava:33.6.0-android"
 google-flexbox = "com.google.android.flexbox:flexbox:3.0.0"
-com-google-devtools-ksp-gradle-plugin = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.2"
+com-google-devtools-ksp-gradle-plugin = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.7"
 
 # Firebase
 firebase-messaging = "com.google.firebase:firebase-messaging:25.0.1"

gradle/verification-metadata.xml

@@ -13140,6 +13140,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0811834079b8ee9f3094b9dc0b931c5cd072f7428089f8e2daf3ba12fbd1f482" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.3.7">
+         <artifact name="symbol-processing-aa-embeddable-2.3.7.jar">
+            <sha256 value="1d9879d9a73a4a0ffbda7e9ab4fbc32e610b2630cdf63988997838b47925034b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.7.0-1.0.6">
          <artifact name="symbol-processing-api-1.7.0-1.0.6.jar">
             <md5 value="0576a483a608fc34628ff67220ed6088" origin="Generated by Gradle"/>
@@ -13188,6 +13193,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d61fc28fd655e912f6d97d8572ef92277bcb44a19f25c58351ddfcd6476d3432" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.3.7">
+         <artifact name="symbol-processing-api-2.3.7.jar">
+            <sha256 value="bc5c7eca84d8142504f28bb1892bb4d1979feffcdbd6061924ef895510480a02" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-api-2.3.7.module">
+            <sha256 value="b38828a894dde24523470bad734d264546742de456a7f8128f670bdcd5952e25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.1.0-1.0.29">
          <artifact name="symbol-processing-cmdline-2.1.0-1.0.29.jar">
             <sha256 value="34c4d5c1c78577e62a1a292d4438ae6bfbb230d1ab56164feccf23abdeb9a96a" origin="Generated by Gradle"/>
@@ -13228,6 +13241,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5b7a7e3e4c91bf0ff791acfbaa69de8216fb1d84f3f4e4d87f13235a531ae94f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.3.7">
+         <artifact name="symbol-processing-common-deps-2.3.7.jar">
+            <sha256 value="ef51e88dad8a839ac0ddea0e66d19ac14c5603f3500995db8fcab1f1be5fd3b9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-common-deps-2.3.7.module">
+            <sha256 value="3d1a012d57304692aeb13e58c0f5baf78da4ca9d88d864ce05c3892c5e437d2c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.1.0-1.0.29">
          <artifact name="symbol-processing-gradle-plugin-2.1.0-1.0.29.jar">
             <sha256 value="d68d5a99bce275bafaeb108448b9ad473b1b062564b11f1ad65bd0b5b3942b92" origin="Generated by Gradle"/>
@@ -13256,6 +13277,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="07c506b4dbf9dbd23268eb92cba3771334d995f58951a411c16a5a7ea79cf15b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.3.7">
+         <artifact name="symbol-processing-gradle-plugin-2.3.7.jar">
+            <sha256 value="3908819cb29c0b1607c4e3488fdcb757b7c2bd996b8928dfa2e139f1dc39da1e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-gradle-plugin-2.3.7.module">
+            <sha256 value="a1a16684e6446bbe5cbeacb40f99c98f40003269e1a0bd0c970a9b8526ecd9a8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotation" version="2.38.0">
          <artifact name="error_prone_annotation-2.38.0.jar">
             <md5 value="9a2e66b9068d96d7a22f0586d70401c7" origin="Generated by Gradle"/>