ADFA-6246 | Move the plugins to AGP 9.3.1 / Gradle 9.6.1 / Kotlin 2.3.21 (#108)

* chore(ADFA-6246): move the plugin toolchain to AGP 9.3.1 / Gradle 9.6.1 / Kotlin 2.3.21

Code On the Go ships AGP 9.3.1, Gradle 9.6.1 and Kotlin 2.3.21
(org.adfa.constants), so the standard these plugins track moves with it.
scripts/check-toolchain.sh holds the numbers and gates every PR; its header is
re-grounded on CoGo stage c263653bcf.

AGP 9 compiles Kotlin itself and refuses org.jetbrains.kotlin.android, so that
plugin is dropped from every module and Kotlin is pinned on the buildscript
classpath in settings.gradle.kts instead, which is where AGP 9 takes its
compiler from.

The check also skips the gitignored .cache/ clone that update-libs.sh creates.
CI never sees it, but locally it reported dozens of failures against a tree
that is not ours to hold to this standard.

* fix(ADFA-6246): build the asset-downloading and LiteRT plugins under Gradle 9

Gradle 9 turns an undeclared task dependency into a hard error. AI-Literacy-Course
and NDK-Installer download their archives into src/main/assets, which more than one
task then reads, so ordering only mergeAssets after the download moves the failure
to the next consumer rather than fixing it -- the lint model task reads the same
directory. Order every other task after the producers instead.

mustRunAfter, not dependsOn: a bare assemblePlugin must keep failing loudly on a
missing archive rather than quietly fetching 110 MB, which is the behaviour the
guard below it exists to enforce.

Sketch-to-UI: litert-support:1.0.1 is a 587-byte alias AAR with no classes whose
manifest declares the same namespace as litert-support-api, and AGP 9 fails the
manifest merge on the duplicate. Depend on litert-support-api, which carries all
75 classes.

* fix(ADFA-6246): build the PCF templates under AGP 9's built-in Kotlin

The same conversion ADFA-6180 made to the NDK template. PCFExample dropped the
kotlin("android") plugin request AGP 9 refuses, pins the Kotlin stdlib to
KOTLIN_VERSION rather than 1.9.22, and moves jvmTarget off the removed
kotlinOptions DSL.

PCFBuilder's root build was the older shape: a version catalog pinning AGP 8.10.1
and Kotlin 2.0.21 by hand, neither tracking the host. It becomes a .peb on
AGP_VERSION like every other template, so it follows Code On the Go instead of
drifting, and the catalog -- referenced by nothing once the plugin aliases are
gone -- is deleted rather than left as a stale number to grep.

Its wrapper also pinned Gradle 8.11.1 literally; it now takes GRADLE_VERSION.

* fix(ADFA-6246): generate templates in the AGP 9 shape

Project-to-Template rewrote the user's Kotlin plugin line as
kotlin("android") version "${{KOTLIN_VERSION}}", so every template it produced
declared the one plugin AGP 9 refuses. The build stayed green here and broke in
the user's hands, on the generated project.

Drop the line instead, and pin the Kotlin Gradle plugin on the generated root
build's buildscript classpath, matching the core templates and what ADFA-6180
did to the NDK one. The LANGUAGE conditional went with it: it only ever wrapped
that plugin line.

The test asserts on generated file contents, which needs the real org.json --
the android.jar stub returns null under isReturnDefaultValues, which is why the
existing test only exercises the dry-run path. Reverting the fix fails the new
test on exactly its kotlin("android") assertion.

* docs(ADFA-6246): drop the Kotlin plugin from the documented plugin shape

CLAUDE.md still told plugin authors to apply org.jetbrains.kotlin.android, which
AGP 9 rejects outright.

---------

Co-authored-by: Daniel Alome <astrocoder007@gmail.com>

Author: Daniel-ADFA

CLAUDE.md

@@ -86,7 +86,7 @@ say so in a comment.
 
 A plugin is an Android *application* module (despite installing as a library) with:
 
-1. **`build.gradle.kts`** applies `com.android.application`, `org.jetbrains.kotlin.android`, and `com.itsaky.androidide.plugins.build`. Configures `pluginBuilder { pluginName = "..." }`. Uses `compileOnly(files("../../libs/plugin-api.jar"))` — never `implementation`.
+1. **`build.gradle.kts`** applies `com.android.application` and `com.itsaky.androidide.plugins.build`. It must **not** apply `org.jetbrains.kotlin.android` — AGP 9 compiles Kotlin itself and refuses that plugin ("already on the classpath with an unknown version"); the Kotlin version is pinned on the buildscript classpath in `settings.gradle.kts` instead, which is where AGP 9 takes its compiler from. Configures `pluginBuilder { pluginName = "..." }`. Uses `compileOnly(files("../../libs/plugin-api.jar"))` — never `implementation`.
 2. **`settings.gradle.kts`** declares the jars it needs on the buildscript classpath plus AGP and Kotlin.
 3. **`src/main/AndroidManifest.xml`** declares plugin identity as `<meta-data>` entries on `<application>`: `plugin.id`, `plugin.name`, `plugin.version` (resolved from `${pluginVersion}`), `plugin.description`, `plugin.author`, `plugin.main_class`, `plugin.min_ide_version`, and optional `plugin.permissions`. Optionally `plugin.vcs_revision` / `plugin.build_timestamp` — see **Build provenance** below.
 4. **Main class** implements `com.itsaky.androidide.plugins.IPlugin`. Lifecycle: `initialize(PluginContext) → activate() → deactivate() → dispose()`. Services are obtained via `context.services.get(SomeService::class.java)` (e.g. `IdeBuildService` for build hooks). Android `Context` is `context.androidContext`.

cotg-ndk/build.gradle.kts

@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
     id("com.itsaky.androidide.plugins.build")
 }
 
@@ -63,13 +62,13 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.10.0")
     implementation("androidx.fragment:fragment-ktx:1.8.8")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.21")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
 }
 
 tasks.wrapper {
-    gradleVersion = "8.14.3"
+    gradleVersion = "9.6.1"
     distributionType = Wrapper.DistributionType.BIN
 }
 

cotg-ndk/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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

cotg-ndk/settings.gradle.kts

@@ -14,8 +14,8 @@ buildscript {
     dependencies {
         classpath(files("../libs/gradle-plugin.jar"))
         classpath(files("../libs/plugin-api.jar"))
-        classpath("com.android.tools.build:gradle:8.11.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
+        classpath("com.android.tools.build:gradle:9.3.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
     }
 }
 

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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pebble-custom-function-template-installer/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
     id("com.itsaky.androidide.plugins.build")
 }
 
@@ -52,7 +51,7 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.10.0")
     implementation("androidx.fragment:fragment-ktx:1.8.8")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.21")
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
@@ -63,7 +62,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
 }
 
 tasks.wrapper {
-    gradleVersion = "8.14.3"
+    gradleVersion = "9.6.1"
     distributionType = Wrapper.DistributionType.BIN
 }
 

pebble-custom-function-template-installer/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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pebble-custom-function-template-installer/settings.gradle.kts

@@ -14,8 +14,8 @@ buildscript {
     dependencies {
         classpath(files("libs/plugin-api.jar"))
         classpath(files("libs/gradle-plugin.jar"))
-        classpath("com.android.tools.build:gradle:8.11.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
+        classpath("com.android.tools.build:gradle:9.3.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
     }
 }
 

pebble-custom-function-template-installer/src/main/assets/templates/PCFBuilder/build.gradle.kts

@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${{KOTLIN_VERSION}}")
+    }
+}
+
+plugins {
+    id("com.android.application") apply false version "${{AGP_VERSION}}"
+    id("com.android.library") apply false version "${{AGP_VERSION}}"
+}