From 5d32749a1cd0a9d259851ac564526edb57eb605e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 15 Nov 2025 07:30:42 +0000 Subject: [PATCH 1/5] Initial plan From b7d0b4c4d499beaa7641dbf878ab19733178151e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 15 Nov 2025 07:39:38 +0000 Subject: [PATCH 2/5] Update Kotlin to 2.1.0 and configure Compose compiler plugin - Update Kotlin from 1.9.22 to 2.1.0 - Fix AGP version from invalid 8.13.0 to 8.7.2 (compatible with Kotlin 2.1.0) - Add compose-compiler plugin to gradle/libs.versions.toml - Add compose-compiler plugin to app/build.gradle.kts - Remove deprecated composeOptions block from app/build.gradle.kts Co-authored-by: RitikaPahwa4444 <83745993+RitikaPahwa4444@users.noreply.github.com> --- app/build.gradle.kts | 4 +--- gradle/libs.versions.toml | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 41788128c7..b5accc5d9d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.kotlin.kapt) alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.compose.compiler) } apply(from = "$rootDir/jacoco.gradle") @@ -182,9 +183,6 @@ android { compose = true } buildToolsVersion = buildToolsVersion - composeOptions { - kotlinCompilerExtensionVersion = "1.5.8" - } packaging { jniLibs { excludes += listOf("META-INF/androidx.*") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a4dd53cb2..437ff39195 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.13.0" +agp = "8.7.2" acra = "5.8.4" activityCompose = "1.9.3" adapterdelegates = "4.3.0" @@ -33,7 +33,7 @@ glide = "4.12.0" gson = "2.8.5" junit = "4.13.2" junitJupiter = "5.10.0" -kotlin = "1.9.22" +kotlin = "2.1.0" kotlinStdlib = "1.8.0" coroutines = "1.7.3" leakcanary = "2.10" @@ -208,5 +208,6 @@ android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } github-triplet-play = { id = "com.github.triplet.play", version.ref = "githubTripletPlay" } getkeepsafe-dexcount = { id = "com.getkeepsafe.dexcount", version.ref = "dexcount" } \ No newline at end of file From 91a3f6949839426a3bdac163a3aa43dbd1717152 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 15 Nov 2025 07:40:38 +0000 Subject: [PATCH 3/5] Restore AGP to 8.13.0 as it's compatible with Gradle 8.13 Co-authored-by: RitikaPahwa4444 <83745993+RitikaPahwa4444@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 437ff39195..4fc6c8e295 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.7.2" +agp = "8.13.0" acra = "5.8.4" activityCompose = "1.9.3" adapterdelegates = "4.3.0" From 7e3503b2ccdea24275383ac0745fffc8a605b005 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 15 Nov 2025 07:59:03 +0000 Subject: [PATCH 4/5] Fix KAPT compatibility with Kotlin 2.1.0 by enabling K2 mode Add kapt.use.k2=true to gradle.properties to enable K2 compiler support for KAPT, which is required for Kotlin 2.0+ compatibility. Co-authored-by: RitikaPahwa4444 <83745993+RitikaPahwa4444@users.noreply.github.com> --- gradle.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gradle.properties b/gradle.properties index 61c3584e58..2f23134b35 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,3 +24,6 @@ android.enableJetifier=true android.jetifier.ignorelist=bcprov-jdk15on android.nonTransitiveRClass=false android.nonFinalResIds=false + +# Enable K2 mode for KAPT (required for Kotlin 2.0+) +kapt.use.k2=true From d62b23d9288fc0eb081d2baf09b8166b22520fd4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 15 Nov 2025 10:38:39 +0000 Subject: [PATCH 5/5] Update Room to 2.7.0 for Kotlin 2.1.0 compatibility Room 2.6.1 doesn't support Kotlin 2.1.0 metadata. Updated to Room 2.7.0 which includes support for Kotlin 2.0+ metadata versions. This fixes the KAPT error: "Provided Metadata instance has version 2.1.0, while maximum supported version is 2.0.0". Co-authored-by: RitikaPahwa4444 <83745993+RitikaPahwa4444@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4fc6c8e295..f9ae80547b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,7 +58,7 @@ recyclerview = "1.2.0-alpha02" recyclerviewFastscroll = "2.0.1" retrofit = "2.8.1" robolectric = "4.14.1" -room = "2.6.1" +room = "2.7.0" rules = "1.5.0" runner = "1.5.2" rxandroid = "2.1.0"