Bump compileSdk/targetSdk to 35 (Android 15), AGP 8.7.3, Gradle 8.9#197
Open
dipenpradhan wants to merge 4 commits into
Open
Bump compileSdk/targetSdk to 35 (Android 15), AGP 8.7.3, Gradle 8.9#197dipenpradhan wants to merge 4 commits into
dipenpradhan wants to merge 4 commits into
Conversation
- Replace kotlin-kapt with com.google.devtools.ksp in the app module
and the common-kotlin convention plugin
- Add Room compiler via the ksp configuration instead of kapt
- Drop the kapt { correctErrorTypes = true } workaround
- Add symbol-processing-gradle-plugin (1.9.22-1.0.17) to buildSrc
Fixes Gurupreet#184
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
- Bump kotlin-gradle-plugin 1.9.22 -> 2.1.20 (root + buildSrc) - Adopt the new Compose Compiler Gradle plugin (org.jetbrains.kotlin.plugin.compose) in app and convention plugins - Drop composeCompiler version constant and composeOptions blocks - Replace removed -Xopt-in flag with -opt-in - Bump KSP to 2.1.20-1.0.31 to match Kotlin Fixes Gurupreet#182 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Gurupreet
approved these changes
Jun 6, 2026
There was a problem hiding this comment.
Pull request overview
Updates the project’s Android/Gradle toolchain to target Android 15 (API 35) and align build tooling with newer plugin requirements across the main build and buildSrc convention scripts.
Changes:
- Bump Gradle wrapper to 8.9 and Android Gradle Plugin to 8.7.3.
- Move build configuration toward the Kotlin 2.x + Compose Compiler plugin model (remove explicit
composeOptionscompiler extension version wiring). - Switch Room compiler wiring from KAPT → KSP in the shared dependency helper and convention plugins.
Reviewed changes
Copilot reviewed 8 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| gradle/wrapper/gradle-wrapper.properties | Bumps Gradle wrapper distribution to 8.9. |
| buildSrc/src/main/kotlin/common-kotlin-module-configs-script-plugin.gradle.kts | Updates convention plugin to use KSP + Compose compiler plugin and removes old Compose compiler extension wiring. |
| buildSrc/src/main/kotlin/common-compose-module-configs-script-plugin.gradle.kts | Applies Compose compiler plugin and updates opt-in compiler flag spelling. |
| buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Versions.kt | Removes Compose compiler version constant and bumps Kotlin version constant. |
| buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/DependencyHandlerExtensions.kt | Moves Room compiler dependency from kapt to ksp. |
| buildSrc/src/main/kotlin/com/guru/composecookbook/build/configurations/ProjectConfigs.kt | Bumps compileSdk/targetSdk to 35 and removes obsolete compiler-extension constant. |
| buildSrc/build.gradle.kts | Updates buildSrc classpath dependencies for Kotlin/Compose/KSP and AGP to newer versions. |
| build.gradle.kts | Bumps AGP/Kotlin/Compose compiler plugin classpaths. |
| app/build.gradle.kts | Switches app module to KSP + Compose compiler plugin and updates opt-in compiler flag spelling. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ktfmt-gradle 0.12.0 fails with 'Generic error during file processing' once Kotlin 2.x is on the buildscript classpath. 0.22.0 supports Kotlin 2.x and also formats *.kts build scripts, hence the repo-wide reformat (no functional changes). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
- AGP 8.2.2 -> 8.7.3 (compileSdk 35 supported from AGP 8.6) - Gradle wrapper 8.5 -> 8.9 (required by AGP 8.7.x) Fixes Gurupreet#185 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
dipenpradhan
force-pushed
the
issue-185-sdk35-agp
branch
from
61edd62 to
d45b54d
Compare
This was referenced Jun 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Bumps the project to Android 15 (API 35), as proposed in #185.
ProjectConfigs.kt:compileSdkVersion/targetSdkVersion34 → 35Notes
Scaffolds/WindowInsets; remaining visual inset glitches on Android 15 hardware should be handled per-screen as follow-ups.Closes #185
Verification
./gradlew assembleDebug testDebugUnitTestpasses locally (JDK 17, SDK 35)./gradlew buildon this PRMerge order
PR 3 of the stacked series. Depends on #195 and #196 — its diff includes their commits until they merge.
🤖 Generated with Claude Code
cc @Gurupreet for review