Update to support AGP 9.1.0 by fegan104 · Pull Request #282 · gobley/gobley

fegan104 · 2026-03-08T21:59:46Z

Changes

This commit updates now deprecated gradle logic around Kotlin Multiplatform and Android library configurations to support AGP 9.1.0, updates the Rust toolchain, and refactors several build/test plugins to use modern Gradle lazy properties.

`rust-toolchain.toml`

Bumped the Rust toolchain channel from 1.83.0 to 1.85.0. I am not much a Rust dev and didn't even have Cargo installed on my machine. So I might be doing something wrong but I was not able to get the project to build using 1.83.0, I always received an error about having to do with getrandom not being compatible. Bumping to toolchain version fixed that. If this is unacceptable for this PR I can just drop the change.

Build Logic & Plugins

`CargoPlugin.kt`

Task Config: Refactored Cargo tasks to utilize modern Task Provider APIs for cleaner configurations and lazier evaluation.

`UniFfiPlugin.kt`

Lazy Outputs Configuration: Replaced dynamic output directory lookups (mainBindingsDirectory, commonBindingsDirectory, etc.) with explicit flatMap resolutions mapped directly from the BuildUniffiBindingsTask output properties (e.g. buildBindings.flatMap { it.commonMainOutputDir }). This satisfies modern Gradle/AGP isolation requirements.
Dependency Registration: Refactored JNA and Coroutines dependency wiring to better handle diverse target plugins (KMP vs standard Android/JVM). Introduces a new addSingleTargetDependency helper for resolving properties independently without aggressively initializing Kotlin SourceSets.

`GobleyAndroidCommonExtensionDelegate.kt`

renamed from GobleyAndroidBaseExtension.kt because the BaseExtension has been remove in AGP 9.

`GobleyAndroidKotlinMultiplatformExtensionDelegate.kt`

Added a new implementation of GobleyAndroidExtensionDelegate for KMP modules with andorid targets.

Example App Configuration

Now that you cannot combine KMP module and the andorid application plugin I added new Android example apps that consume the original KMP module. I suppose it would make sense to rename the old app modules to be something alon gthe lines of audio-cpp-lib or todolist-lib instead of app since they aren't really app modules any more but that's not necessary to do now.

Testing

I ran through every unit test, android integration test, and ran example apps on JVM, Android, iOS.

Issues Fixed

Fixes: #153

…oPlugin

Jessewb786 · 2026-03-16T13:31:26Z

In Kotlin KMP, how can we pass along the NDK to the cargo plugin when there is no android {} block now?

fegan104 · 2026-03-16T14:11:22Z

In Kotlin KMP, how can we pass along the NDK to the cargo plugin when there is no android {} block now?

The android { ... } block still exists but it's nested inside of the kotlin { ... } block. https://developer.android.com/kotlin/multiplatform/plugin#migrate

You can still get a reference to ndkDirectory with KotlinMultiplatformAndroidComponentsExtension that cargoPlugin can leverage in KMP modules.

That being said the api changed very substantially, and native support is more limited for android in KMP Google recommends:

Alternatively, if you need native build support via externalNativeBuild, our recommendation is to create a separate standalone com.android.library module where you can integrate native code, and consume that standalone library from your Kotlin Multiplatform library project's androidMain source set

Happy to discuss the approach taken in this PR and very open to alternatives suggestions

fegan104 · 2026-03-19T02:10:08Z

+        action: OnVariantAction,
+    ) {
+        kotlinMultiplatformLibraryExtension.onVariants { agpVariant ->
+            val isReleaseRequest = project.providers.gradleProperty("gobley.android.release")


Now that KMP module can no longer use debug/release variants, I'm not sure how else to configure release mode. It looks like you use a CONFIGuRATION env var for XCode builds should we try to do the same here?

For Xcode builds, it is guaranteed that Xcode initializes specific environment variables, but for Android builds, there's no such thing. Currently, Gobley exposes properties like cargo.jvmVariant and cargo.jvmPublishingVariant, so the users can use their preferred Cargo profiles. I'm thinking of making this part read cargo.jvmVariant or cargo.jvmPublishingVariant, I'm just not sure where there will be any scenario that the user wants to build the dev version for Android while the release version for Desktop Java, or vice versa.

fegan104 · 2026-03-19T02:37:45Z

Also I understand this is an outrageously large PR submitted as a single commit, so I can potentially break it up into multiple PRs to make it more reviewable if desired.

paxbun · 2026-03-30T16:50:00Z

Sorry for the late reply. I'll review this by tomorrow. Thanks for waiting and sorry for making you wait again :(

fegan104 · 2026-03-30T17:45:38Z

Sorry for the late reply. I'll review this by tomorrow. Thanks for waiting and sorry for making you wait again :(

Oh no worries, this was a huge change the the gradle API

paxbun · 2026-04-01T07:17:03Z

+        action: OnVariantAction,
+    ) {
+        kotlinMultiplatformLibraryExtension.onVariants { agpVariant ->
+            val isReleaseRequest = project.providers.gradleProperty("gobley.android.release")


For Xcode builds, it is guaranteed that Xcode initializes specific environment variables, but for Android builds, there's no such thing. Currently, Gobley exposes properties like cargo.jvmVariant and cargo.jvmPublishingVariant, so the users can use their preferred Cargo profiles. I'm thinking of making this part read cargo.jvmVariant or cargo.jvmPublishingVariant, I'm just not sure where there will be any scenario that the user wants to build the dev version for Android while the release version for Desktop Java, or vice versa.

paxbun · 2026-04-01T07:20:22Z

-                else -> dependencyProject.path
-            }
-        }
+        get() = path


I want to keep the compatibility between Gobley and older versions of Gradle; is this part for fixing compilation error due to missing ProjectDependency.dependencyProject?

paxbun · 2026-04-01T07:21:43Z


    // Ensures getNumAlive() always returns deterministic value
-    private val coverallLock = ReentrantLock()
+    private val coverallLock = reentrantLock()


Does the compiler complain about this?

paxbun · 2026-04-01T07:23:21Z

I was going to include this in 0.3.8, but this will cause a lot of changes in binary APIs. Will it be possible to minimize the changes and split the PR so some of the fixes are included in 0.3.8 (which will be the final version of 0.3.x) and leave the other for 0.4.0?

For faster onboarding, integration with the AGP application plugin is important. I want to keep the application examples to use the application plugin. I'm planning to re-organize the examples and the plugin directory, do you have any suggestions?

… AGP 9-compatible onVariants API AGP 9 sets `MergeSourceSetFolders.variant` to null, causing NPE in GobleyKotlinAndroidExtensionDelegate that silently drops JNI lib wiring. Fixes librival_sdk.so missing from debug APK. Port of gobley PR gobley#282: introduce GobleyAndroidCommonExtensionDelegate and GobleyAndroidKotlinMultiplatformExtensionDelegate that use `androidComponents.onVariants { agpVariant -> agpVariant.sources.jniLibs?.addGeneratedSourceDirectory(task) { it.outputDir } }` instead of task graph introspection. Delete GobleyKotlinAndroidExtensionDelegate. Add InjectJniLibsTask with typed outputDir property.

mtpdog · 2026-05-27T11:06:42Z

This commit updates now deprecated gradle logic around Kotlin Multiplatform and Android library configurations to support AGP 9.1.0, updates the Rust toolchain, and refactors several build/test plugins to use modern Gradle lazy properties.

This is great! Could you please publish your fork to Maven as a temporary fix for AGP 9+ cases? It is so needed.

paxbun added 5 commits February 21, 2026 11:56

Add the Android KMP library plugin to dependencies

7738bda

tmp: Make :examples:custom-types use the KMP plugin

282cded

tmp: Add GobleyAndroidKotlinMultiplatformExtensionDelegate

b4d1548

tmp: Assume the debug variant for Android KMP targets in UniFfiPlugin

93f8b07

tmp: Add KotlinTarget.androidKmpLibraryCompatiblePlatformType to Carg…

37febf0

…oPlugin

fegan104 changed the title ~~Fegan104/agp9~~ Update to support AGP 9.1.0 Mar 8, 2026

fegan104 force-pushed the fegan104/agp9 branch 4 times, most recently from 4dab62b to f0f8493 Compare March 16, 2026 03:28

fegan104 force-pushed the fegan104/agp9 branch 4 times, most recently from 1617f4e to a4c73b8 Compare March 19, 2026 01:33

fegan104 commented Mar 19, 2026

View reviewed changes

fegan104 force-pushed the fegan104/agp9 branch 2 times, most recently from de445b8 to b90f619 Compare March 19, 2026 02:34

Add support for AGP 9.1.0

d5d5b25

fegan104 force-pushed the fegan104/agp9 branch from b90f619 to d5d5b25 Compare March 19, 2026 02:36

fegan104 marked this pull request as ready for review March 19, 2026 02:38

paxbun added this to the 0.3.8 milestone Mar 31, 2026

paxbun reviewed Apr 1, 2026

View reviewed changes

paxbun mentioned this pull request Apr 2, 2026

Add Android KMP library backend alongside legacy AGP integration #280

Open

Navigation Menu

Uh oh!

Update to support AGP 9.1.0 - #282

Update to support AGP 9.1.0#282
fegan104 wants to merge 6 commits into
gobley:mainfrom
fegan104:fegan104/agp9

fegan104 commented Mar 8, 2026 •

edited

Loading

Uh oh!

Jessewb786 commented Mar 16, 2026

Uh oh!

fegan104 commented Mar 16, 2026

Uh oh!

fegan104 Mar 19, 2026

Uh oh!

paxbun Apr 1, 2026

Uh oh!

fegan104 commented Mar 19, 2026

Uh oh!

paxbun commented Mar 30, 2026

Uh oh!

fegan104 commented Mar 30, 2026

Uh oh!

paxbun Apr 1, 2026

Uh oh!

paxbun Apr 1, 2026

Uh oh!

paxbun Apr 1, 2026

Uh oh!

paxbun commented Apr 1, 2026 •

edited

Loading

Uh oh!

mtpdog commented May 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

fegan104 commented Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

rust-toolchain.toml

Build Logic & Plugins

CargoPlugin.kt

UniFfiPlugin.kt

GobleyAndroidCommonExtensionDelegate.kt

GobleyAndroidKotlinMultiplatformExtensionDelegate.kt

Example App Configuration

Testing

Issues Fixed

Uh oh!

Jessewb786 commented Mar 16, 2026

Uh oh!

fegan104 commented Mar 16, 2026

Uh oh!

fegan104 Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

paxbun Apr 1, 2026

Choose a reason for hiding this comment

Uh oh!

fegan104 commented Mar 19, 2026

Uh oh!

paxbun commented Mar 30, 2026

Uh oh!

fegan104 commented Mar 30, 2026

Uh oh!

paxbun Apr 1, 2026

Choose a reason for hiding this comment

Uh oh!

paxbun Apr 1, 2026

Choose a reason for hiding this comment

Uh oh!

paxbun Apr 1, 2026

Choose a reason for hiding this comment

Uh oh!

paxbun commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mtpdog commented May 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fegan104 commented Mar 8, 2026 •

edited

Loading

`rust-toolchain.toml`

`CargoPlugin.kt`

`UniFfiPlugin.kt`

`GobleyAndroidCommonExtensionDelegate.kt`

`GobleyAndroidKotlinMultiplatformExtensionDelegate.kt`

paxbun commented Apr 1, 2026 •

edited

Loading