Toolchain migration: AGP 9, Gradle 9, built-in Kotlin, plugin upgrades - #20
Open
michelutke wants to merge 17 commits into
Open
Toolchain migration: AGP 9, Gradle 9, built-in Kotlin, plugin upgrades#20michelutke wants to merge 17 commits into
michelutke wants to merge 17 commits into
Conversation
…and jetifier No deprecations found in build scripts (Task 1 baseline: zero Gradle deprecation warnings), so Step 4 of the brief is a no-op. Verification build shows only two pre-existing source-level warnings unrelated to Gradle/AGP (Compose menuAnchor(), Java overridePendingTransition), both in production src/ and out of scope for this task.
… targetSdk KMP modules (updraft-core, updraft-ui-compose) fail configuration under AGP 9 with com.android.library + kotlin.multiplatform; they migrate to the new com.android.kotlin.multiplatform.library target plugin in follow-up commits.
…ry with androidResources enabled
AGP 9's built-in Kotlin no longer allows org.jetbrains.kotlin.multiplatform
together with com.android.application in the same module. Per Kotlin's own
AGP 9 migration guide, the prescribed fix is to extract the Android entry
point into its own application module and convert the shared code module to
the Android-KMP library plugin (com.android.kotlin.multiplatform.library).
sample/composeApp is now that shared library (androidTarget + iOS targets,
namespace com.appswithlove.updraftsdk.shared); the new sample/androidApp
module holds the app shell (manifest, MainActivity, App, launcher resources,
signing, applicationId/versionCode/versionName, build types) and depends on
composeApp and updraft-sdk.
The com.appswithlove.updraft 2.3.0 plugin is parked (commented out) in
sample/androidApp/build.gradle.kts: it casts the AGP application extension to
the removed legacy AppExtension type
("ApplicationExtensionImpl$AgpDecorated_Decorated cannot be cast to
AppExtension") and fails to apply under AGP 9. Catalog entry and root
apply-false are left intact; see TODO(#16) at the commented plugin alias to
re-enable once the plugin ships AGP 9 support.
composeMultiplatform capped at 1.10.3 instead of the planned 1.11.1: 1.11.0/1.11.1 ship iOS components-resources klibs built with a newer Kotlin/Native ABI (2.3.0) than our pinned Kotlin 2.2.21 can consume, breaking iosSimulatorArm64Test. 1.10.3 is the newest CMP release that still builds, tests, and publishes cleanly on 2.2.21.
Mark AGP 9 upgrade as implemented on feature/toolchain-agp9 with the final version set (Gradle 9.6.1, AGP 9.3.1, CMP 1.10.3, vanniktech 0.37.0, dokka 2.2.0, loco 1.2.0, androidx.startup 1.2.0, coveralls 2.12.2), sample split, and parked updraft plugin. README Kotlin compatibility matrix verified accurate, no change needed.
The AGP 9 incompatibility only affected plugin 2.x; 3.0.0 (released 2026-01-22) requires AGP 9+ and applies cleanly. Removes the TODO(#16) park from sample/androidApp and restores the updraft {} upload wiring.
michelutke
marked this pull request as ready for review
July 31, 2026 05:46
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
1 participant
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.
Closes #16.
Why
com.android.library+kotlin.multiplatform, the standalonekotlin.androidplugin, and app+KMP single modules — so this is a hard prerequisite for any future toolchain work.locoFetch/locoPush) — push previously required the standalone CLI or manual dashboard work.What
gradle→agp); obsolete flags removed (jetifier,useAndroidX),baseplugin dropped, librarytargetSdkremoved.:updraft-core/:updraft-ui-compose→ newcom.android.kotlin.multiplatform.librarytarget plugin, withwithHostTestBuilder {}(Android host tests live on astestAndroidHostTest, 18+12 green) andandroidResources { enable = true }(compose resources stay packaged — CMP-9547).:updraft-sdk→ AGP 9 built-in Kotlin (no morekotlin.androidplugin; top-levelkotlin { compilerOptions {} }).sample/composeAppis now a shared KMP library; new thinsample/androidAppcarries applicationId/signing/manifest (pure file renames). AGP 9 forbidscom.android.application+kotlin.multiplatformin one module.sample/iosAppuntouched.updateLoco→locoFetch/locoPush; renameupdraft.locoApiKey→locoApiKeyin yourlocal.properties) · CMP 1.10.3 (not 1.11.x — its iOS klibs need Kotlin ≥ 2.3).testDebugUnitTest→testAndroidHostTest).How
publishToMavenLocalsnapshot diffed before/after — file set, POM dependency chains,.modulevariant dependencies and compose-resource aar contents identical. Accepted metadata deltas (documented): variant namesrelease*→android*Elements(+libraryelementsattribute; attribute contract intact), droppedkotlin-*-commonPOM exclusions (empty stubs since Kotlin 1.8), deliberate dependency bumps, toolchain stamps.updraft-sdk:2.0.0from mavenLocal; resolved graph verified free ofkotlin-*-commonstubs — Kotlin floor unchanged.locoFetchround-trip clean.Manual merge gates (pending — do not merge before)
locoPushdry-run (full-access key)Follow-ups (not in this PR)
updraft-sdkhas no unit tests;menuAnchor/overridePendingTransitiondeprecations; drop coveralls?