Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .github/android-consumer-test/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ pluginManagement {
plugins {
// AGP 9.x requires Gradle >= 9.4.1 — see the gradle-version pins on the CI jobs
// that build this fixture in publish.yml (package-android-aar, test-android-emulator).
id("com.android.application") version "9.2.0"
// 9.2.1 (not 9.2.0) is pinned: it fixes a real R8 regression
// (java.lang.ClassNotFoundException on com.android.tools.r8.RecordTag after
// upgrading Gradle to 9.x with AGP 9.2.0) that hits this fixture directly since
// buildTypes.release sets isMinifyEnabled = true.
id("com.android.application") version "9.2.1"
}
}

Expand Down
8 changes: 6 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -1652,9 +1652,13 @@ compiles/loads the API); this one has a UI and is driven end-to-end. The name is
domain is the only string that must be globally unique.

Structure (mirrors the consumer-test's plumbing):
- **`settings.gradle.kts`** — `rootProject.name = "android-llmservice"`; pins AGP `9.2.0` + the
- **`settings.gradle.kts`** — `rootProject.name = "android-llmservice"`; pins AGP `9.2.1` + the
Compose compiler plugin (`2.4.0`); `mavenLocal()` first so the freshly-built AAR + façade
resolve there in CI (Maven Central for real users). AGP 9.x requires Gradle >= 9.4.1 and
resolve there in CI (Maven Central for real users). `9.2.1` (not `9.2.0`) fixes a real R8
regression (`ClassNotFoundException` on `com.android.tools.r8.RecordTag` after upgrading
Gradle to 9.x with AGP 9.2.0) that hits this project directly since `buildTypes.release`
sets `isMinifyEnabled = true`; the `.github/android-consumer-test` fixture is pinned the
same way for the same reason. AGP 9.x requires Gradle >= 9.4.1 and
JDK 17+; CI already runs JDK 21 everywhere (`env.JAVA_VERSION`), so only the `gradle-version`
pin on the jobs that build this project (and the `.github/android-consumer-test` fixture)
needed bumping. AGP 9.0+ has **built-in Kotlin support** (a runtime dependency on Kotlin
Expand Down
2 changes: 1 addition & 1 deletion android-llmservice/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ gradle -p android-llmservice connectedDebugAndroidTest -PjllamaVersion="$VERSION

```
android-llmservice/
├── settings.gradle.kts # AGP 9.2.0 + Kotlin 2.4.0 + Compose plugin, mavenLocal first
├── settings.gradle.kts # AGP 9.2.1 (built-in Kotlin) + Compose plugin 2.4.0, mavenLocal first
├── gradle.properties
├── requirements.md # spec of record: every feature the app implements today (no unit tests)
├── TODO.md # roadmap: not-yet-built features
Expand Down
16 changes: 10 additions & 6 deletions android-llmservice/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ pluginManagement {
}
// Versions pinned here (KISS: no version catalog). AGP matches the consumer-test
// fixture. AGP 9.x requires Gradle >= 9.4.1 — see the gradle-version pins on the CI
// jobs that build this project in publish.yml. AGP 9.0+ has built-in Kotlin support
// (runtime dependency on Kotlin Gradle plugin 2.2.10+), so the standalone
// org.jetbrains.kotlin.android plugin is no longer applied/needed — see
// https://developer.android.com/build/migrate-to-built-in-kotlin. The Compose
// compiler plugin (2.4.0) still applies separately and exceeds AGP's 2.2.10 floor.
// jobs that build this project in publish.yml. 9.2.1 (not 9.2.0) is pinned: it fixes
// a real R8 regression (java.lang.ClassNotFoundException on
// com.android.tools.r8.RecordTag after upgrading Gradle to 9.x with AGP 9.2.0) that
// hits this project directly since buildTypes.release sets isMinifyEnabled = true.
// AGP 9.0+ has built-in Kotlin support (runtime dependency on Kotlin Gradle plugin
// 2.2.10+), so the standalone org.jetbrains.kotlin.android plugin is no longer
// applied/needed — see https://developer.android.com/build/migrate-to-built-in-kotlin.
// The Compose compiler plugin (2.4.0) still applies separately and exceeds AGP's
// 2.2.10 floor.
plugins {
id("com.android.application") version "9.2.0"
id("com.android.application") version "9.2.1"
id("org.jetbrains.kotlin.plugin.compose") version "2.4.0"
}
}
Expand Down
Loading