Skip to content

Update Kotlin to 2.1.0 and migrate to Compose Compiler plugin #6558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RitikaPahwa4444 merged 8 commits into from
Jan 18, 2026
+8 −5
Merged

Update Kotlin to 2.1.0 and migrate to Compose Compiler plugin #6558

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d32749
Initial plan
Copilot Nov 15, 2025
b7d0b4c
Update Kotlin to 2.1.0 and configure Compose compiler plugin
Copilot Nov 15, 2025
91a3f69
Restore AGP to 8.13.0 as it's compatible with Gradle 8.13
Copilot Nov 15, 2025
7e3503b
Fix KAPT compatibility with Kotlin 2.1.0 by enabling K2 mode
Copilot Nov 15, 2025
d62b23d
Update Room to 2.7.0 for Kotlin 2.1.0 compatibility
Copilot Nov 15, 2025
862d898
Add compose-compiler plugin to top-level build.gradle.kts
Copilot Nov 29, 2025
521546d
Merge branch 'main' into copilot/fix-issue-6551
nicolas-raoul Dec 8, 2025
16159f2
Merge branch 'main' into copilot/fix-issue-6551
RitikaPahwa4444 Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Collaborator

@psh psh Nov 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Google's own migration doc says to also add a line to the top-level gradle file (in addition to the app folder one) -

    alias(libs.plugins.compose.compiler) apply false

Copy link
Collaborator

@RitikaPahwa4444 RitikaPahwa4444 Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @psh for checking this, I didn't get a chance to review this further. @copilot could you check the above suggestion?

Copy link
Contributor Author

Copilot AI Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit 862d898. Added alias(libs.plugins.compose.compiler) apply false to the top-level build.gradle.kts file as per Google's Compose migration documentation.

}

apply(from = "$rootDir/jacoco.gradle")
Expand Down Expand Up @@ -182,9 +183,6 @@ android {
compose = true
}
buildToolsVersion = buildToolsVersion
composeOptions {
kotlinCompilerExtensionVersion = "1.5.8"
}
packaging {
jniLibs {
excludes += listOf("META-INF/androidx.*")
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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" }
Loading