From e0f240b877011b5665500be1c298d7917c811c1e Mon Sep 17 00:00:00 2001 From: Ahmet Kerim Senol Date: Thu, 28 May 2026 14:24:28 +0000 Subject: [PATCH] Remove android.disallowKotlinSourceSets=false This will ensure compatibility with AGP 10.0 --- app/build.gradle.kts | 6 ------ gradle.properties | 3 --- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 29 +++++++++++++++++++++++++++++ 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca61c7f4044..c2ec59a3c35 100644 --- a/app/build.gradle.kts +++ b/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 { diff --git a/gradle.properties b/gradle.properties index 1d043e40484..8efdcfb8c66 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a118c58049e..2e9c0553767 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9aa3f3f17af..ebf801ee0b4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -13140,6 +13140,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -13188,6 +13193,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -13228,6 +13241,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -13256,6 +13277,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + +