F-019: Gradle 9.6.1 + Kotlin 2.3.21 + AGP 9.3.0 toolchain (#193)

Ship Phase 1 of the 9.x ladder after explicit OK:
- All wrappers → Gradle 9.6.1 (embedded Kotlin 2.3.21)
- AGP 9.3.0 lockstep, aapt2-proto 9.3.0-15703166, KSP 2.3.10,
  Compose compiler 2.3.21, Dagger 2.60.1 (metadata 2.3)
- Gradle 9 / AGP 9 API fixes: ProjectDependency.path, compilerOptions,
  public LibraryExtension/CommonExtension, drop context-receivers
- Sample keeps android.builtInKotlin=false + android.newDsl=false while
  kapt/Dagger remains (Phase 2: built-in Kotlin + KSP)
- includer TestKit JVM 17 + foojay-resolver 1.0.0

Verified host builds: plugins, application, jvm-application, includer, depgen.

Co-authored-by: Claw <claw@Claws-MacBook-Pro.local>

Author: stepango

README.md

@@ -85,7 +85,7 @@ buildscript {
         minSdk = 21,
         targetSdk = 33,
         compileSdk = 34,
-        agpVersion = "8.13.2",
+        agpVersion = "9.3.0",
         // extraPlugins = buildscript classpath only (jars for AGP, safe-args, etc.).
         // Actual plugin apply to targets is type-owned — see docs/TARGET-PLUGINS.md.
         extraPlugins = listOf(

TICKETS.md

@@ -22,7 +22,8 @@ Canonical write-up: `docs/VISION.md` § Root principles. Plugins design: `docs/T
 | F-002 | done | Audit build graph: plugins, sample app, CI workflows | Map modules → forma-core candidates; capture in `docs/ARCHITECTURE.md` |
 | F-003 | done | Get plugins + sample `application/` building on modern toolchain | Plugins compile AGP 8.1.2 matches sample; Gradle 8.3 (plugins) / 8.4 (app); host builds green |
 | F-004 | done | CI green on GitHub Actions for plugins + application | Temurin 17 all jobs + Android SDK 33 for app; PR #153 GHA green |
-| F-018 | done | JDK 21 + Gradle/AGP staged modernization | **Shipped on `v2`:** Gradle **8.14.5**, AGP **8.13.2**, Kotlin **2.0.21**, KSP **2.0.21-1.0.28**, Compose **1.9.4**/compiler **2.0.21**, JDK **21** host/CI, sample SDK min23/target35/compile35 + deps at AGP-8.13 ceiling. PRs **#179–#182**. AGP 9 / absolute-latest AndroidX = **F-019** (explicit OK only). |
+| F-018 | done | JDK 21 + Gradle/AGP staged modernization | **Shipped on `v2`:** Gradle **8.14.5**, AGP **8.13.2**, Kotlin **2.0.21**, KSP **2.0.21-1.0.28**, Compose **1.9.4**/compiler **2.0.21**, JDK **21** host/CI, sample SDK min23/target35/compile35 + deps at AGP-8.13 ceiling. PRs **#179–#182**. Superseded by **F-019** for 9.x. |
+| F-019 | done | Gradle 9 + Kotlin 2.3 + AGP 9 toolchain | **Shipped Phase 1:** Gradle **9.6.1** (embedded Kotlin **2.3.21**), AGP **9.3.0**, KSP **2.3.10**, Compose compiler **2.3.21**, aapt2-proto **9.3.0-15703166**, Dagger **2.60.1**. Sample uses `android.builtInKotlin=false` + `android.newDsl=false` (kapt/Dagger still). **Phase 2 backlog:** built-in Kotlin + kapt→KSP + AndroidX ceiling. |
 
 ## P1 — Android working product
 
@@ -98,8 +99,8 @@ Close the biggest call-site / multi-way gap: chain `withPlugin`. Design:
 ## P8 — Principle alignment (implementation matches goals)
 
 Close remaining gaps where code/docs still allow **multiple ways**, **fat call
-sites**, or **missing fleet tooling**. P7 (F-070–F-073) and F-081–F-082 are **done**;
-next coding priority is **F-083**.
+sites**, or **missing fleet tooling**. P7 (F-070–F-073) and F-081–F-082 are **done**; **F-019 Phase 1 done**.
+**Next coding:** **F-083**.
 
 | ID | Status | Title | Notes |
 |----|--------|-------|-------|
@@ -127,7 +128,7 @@ Keep for reference; do not start unless higher tickets done or user prioritizes:
 - GH #126 Target features configuration options → consider under **F-081**
 - GH #111 Gradle project as buildscript classpath
 - GH #103 Java 8+ API on Android API ≤26
-- **F-019** AGP 9 / absolute-latest AndroidX — **explicit OK only** (not on board until requested)
+- F-019 Phase 2: AGP built-in Kotlin migration + absolute-latest AndroidX / compileSdk bump (after Phase 1 green)
 
 ## How workers update this file
 

application/build.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         targetSdk = 35,
         // compileSdk 35+ required by Compose 1.11 / modern AndroidX AAR metadata
         compileSdk = 35,
-        agpVersion = "8.13.2",
+        agpVersion = "9.3.0",
         extraPlugins =
             listOf(
                 libs.plugins.toolsFormaDemoDependencies,

application/feature/characters/favorite/impl/src/main/java/tools/forma/sample/feature/characters/favorite/impl/ui/CharacterFavoriteFragment.kt

@@ -27,6 +27,7 @@ import tools.forma.sample.core.di.library.BaseComponentProvider
 import tools.forma.sample.core.mvvm.library.ui.BaseViewBindingFragment
 import tools.forma.sample.core.mvvm.library.viewModels
 import tools.forma.sample.feature.characters.core.api.domain.model.ICharacter
+import tools.forma.sample.feature.characters.favorite.impl.presentation.CharacterFavoriteViewModel
 import tools.forma.sample.feature.characters.favorite.viewbinding.presentation.ICharacterFavoriteViewModel
 import tools.forma.sample.feature.characters.favorite.viewbinding.presentation.ICharacterFavoriteViewState
 import tools.forma.sample.feature.characters.favorite.impl.R
@@ -39,7 +40,7 @@ class CharacterFavoriteFragment : BaseViewBindingFragment(
     layoutId = tools.forma.sample.feature.characters.favorite.viewbinding.R.layout.fragment_character_favorite_list
 ) {
 
-    private val viewModel: ICharacterFavoriteViewModel by viewModels()
+    private val viewModel: ICharacterFavoriteViewModel by viewModels<CharacterFavoriteViewModel>()
     private val viewBinding: FragmentCharacterFavoriteListBinding by viewBinding(FragmentCharacterFavoriteListBinding::bind)
 
     private val viewAdapter = CharacterFavoriteAdapter()

application/gradle.properties

@@ -26,5 +26,8 @@ org.gradle.unsafe.configuration-cache=true
 org.gradle.unsafe.configuration-cache-problems=warn
 org.gradle.unsafe.configuration-cache.max-problems=5
 # TODO apply via forma
-android.defaults.buildfeatures.buildconfig=false
 android.nonTransitiveRClass=true
+# F-019 Phase 1: AGP 9 + Gradle 9 while sample still uses kapt (Dagger).
+# Built-in Kotlin + new DSL require kapt→KSP migration (Phase 2).
+android.builtInKotlin=false
+android.newDsl=false

application/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

application/settings.gradle.kts

@@ -38,18 +38,36 @@ buildscript {
                     "org.checkerframework:checker-qual:3.43.0",
                     "com.google.errorprone:error_prone_annotations:2.28.0",
                     "commons-codec:commons-codec:1.17.1",
-                    "com.android.tools.build:aapt2-proto:8.13.2-14304508",
-                    // Gradle 8.14.5 embeds Kotlin 2.0.21 — force stdlib family lockstep under failOnVersionConflict
+                    "com.android.tools.build:aapt2-proto:9.3.0-15703166",
+                    // Gradle 9.6.1 embeds Kotlin 2.3.21 — force stdlib + KGP family lockstep under failOnVersionConflict
+                    // (AGP 9.3 pulls kotlin-stdlib 2.2.10 transitively)
                     "org.jetbrains.kotlin:kotlin-stdlib:$embeddedKotlinVersion",
                     "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$embeddedKotlinVersion",
                     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$embeddedKotlinVersion",
                     "org.jetbrains.kotlin:kotlin-stdlib-common:$embeddedKotlinVersion",
                     "org.jetbrains.kotlin:kotlin-reflect:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-gradle-plugins-bom:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:fus-statistics-gradle-plugin:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-compiler-embeddable:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-android-extensions-runtime:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-build-tools-api:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-build-tools-impl:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-build-tools-compat:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-native-utils:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-util-klib:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-util-io:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-daemon-embeddable:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-script-runtime:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-scripting-common:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-scripting-jvm:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:$embeddedKotlinVersion",
+                    "org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:$embeddedKotlinVersion",
                     "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2",
                     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2",
                     "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2",
-                    "com.android.tools.build:gradle:8.13.2",
-                    "org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion",
+                    "com.android.tools.build:gradle:9.3.0",
                     "com.squareup:javapoet:1.13.0"
                 )
                 failOnVersionConflict()
@@ -101,8 +119,8 @@ projectDependencies(
     plugin("com.google.firebase:firebase-crashlytics-gradle", "3.0.7"),
     plugin(
         id = "com.google.devtools.ksp:symbol-processing-gradle-plugin",
-        // Gradle 8.14.5 embeds Kotlin 2.0.21; KSP must match
-        version = "2.0.21-1.0.28",
+        // Gradle 9.6.1 embeds Kotlin 2.3.21; KSP 2.3.x line (standalone numbering)
+        version = "2.3.10",
         configuration = ksp,
         "androidx.room:room-compiler:$roomVersion"
     )

bazel-adapter/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

bazel-adapter/settings.gradle.kts

@@ -8,9 +8,9 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
     }
-    // Match Gradle 8.14.5 embedded Kotlin
+    // Match Gradle 9.6.1 embedded Kotlin
     plugins {
-        id("org.jetbrains.kotlin.jvm") version "2.0.21"
+        id("org.jetbrains.kotlin.jvm") version "2.3.21"
     }
 }
 

build-dependencies/dependencies/src/main/kotlin/Androidx.kt

@@ -302,7 +302,7 @@ object androidx {
     /**
      * Jetpack Compose runtime + UI + foundation + material (pinned versions).
      * Pair with `compose = true` / `composeWidget` targets (F-013).
-     * Versions match Compose Compiler **2.0.21** / Kotlin **2.0.21** (Gradle 8.14.5).
+     * Versions match Compose Compiler **2.3.21** / Kotlin **2.3.21** (Gradle 9.6.1).
      * Uses [transitiveDeps] so Compose UI unit/graphics transitively resolve.
      * Does not include activity-compose (pulls emoji2 requiring compileSdk 34);
      * add that separately when hosting Compose in Activities on SDK 34+.