Support AGP with Kotlin Built-in #4295

adam-enko · 2025-10-14T15:25:59Z

When using AGP 9, KGP is no longer required. AGP will be responsible for configuring Kotlin compilation. DGP needs to support Kotlin Built-in by extracting information from AGP instead of KGP.

Summary of changes

Update KotlinAdapter and AndroidAdapter to handle AGP with Kotlin built-in.
- Capture classpaths of variants from AndroidComponentsExtension instead of the Android extension.
- Update captured AGP variant info to include classpaths.
- Only apply KotlinAdapter and AndroidAdapter once per project (Remove the exec() function, only apply the plugin once using KotlinAdapter.applyTo()).
Add tests for AGP 9.
- it-android-kotlin-jvm-builtin - AGP & kotlin-built-in (no KGP plugin).
- it-android-kotlin-mp-builtin - AGP & kotlin-multiplatform.
Fix AGP <9 tests & update test data.

Integration tests: support AGP 9 testing and version filtering

Add min/max version to @TestsAndroid and @TestsAndroidCompose filter AGP versions.
Add SemVerRange to help with filtering.
Add AGP9 properties.

…publishable'

rename file to match function name Update test.

Add kdoc

…f code

When using AGP 9, KGP is no longer required. AGP will be responsible for configuring Kotlin compilation. DGP needs to support Kotlin BuiltIn by extracting information from AGP instead of KGP. - Update KotlinAdapter and AndroidAdapter to handle AGP with Kotlin built-in. - Capture classpaths of variants from `AndroidComponentsExtension` instead of the Android extension. - Update captured AGP variant info to include classpaths. - Only apply KotlinAdapter and AndroidAdapter once per project (Remove the `exec()` function, only apply the plugin once using `KotlinAdapter.applyTo()`).

Preparation for testing AGP9. - Add min/max version to `@TestsAndroid` and `@TestsAndroidCompose` filter AGP versions. - Add SemVerRange to help with filtering. - Add AGP9 properties.

…dComponentsExtension

whyoleg · 2025-11-12T08:33:47Z

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/JavaAdapter.kt

                    && name.startsWith(MAIN_SOURCE_SET_NAME)
+
+        internal fun applyTo(project: Project) {
+            project.pluginManager.apply(type = JavaAdapter::class)


minor (again, about consistency): we should probably react on java plugins here, and not just apply it uncoditionally. E.g. use project.plugins.withType<JavaBasePlugin>() as with kotlin/android adapters

True - but let's not do it in this PR, since it's not related to AGP support.

Fixed in #4362

whyoleg · 2025-11-12T08:37:50Z

dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/PluginId.kt

+        AndroidLibrary,
+        AndroidTest,
+        AndroidDynamicFeature,
+        AndroidKmpLibrary,


Curious: do we need it here? I mean, I thought, that with that plugin, we should have enough information coming from KGP, and so we should not apply AndroidAdapter in that case.

You mean AndroidKmpLibrary?

See the test project:
https://github.com/Kotlin/dokka/blob/adam/support-agp-kotlin-builtin/dokka-integration-tests/gradle/projects/it-android-kotlin-mp-builtin/build.gradle.kts

The only AGP plugin is com.android.kotlin.multiplatform.library. If that plugin is present then AndroidAdapter is required.

You mean AndroidKmpLibrary?

Yeah, I mean specifically this one.

Got it, for some reason, I thought that compilationClasspath from the kotlin compilation itself should be enough.

Does it make sense to extract anything besides androidExt.bootClasspath() in this case in AndroidAdapter?
Don't we get the classpath from Kotlin compilations?

In which cases classpath from Kotlin compilation is not enough?

In which cases classpath from Kotlin compilation is not enough?

If built-in-kotlin isn't enabled, or it's a non-Kotlin project (although DGP doesn't have tests for this).

Oleg and I looked into it more, applying AndroidAdapter when AndroidKmpLibrary is present doesn't appear to be necessary. compilationClasspath already contains android.jar and the classpath from Android's Components.

In fact, for kotlin-built-in & AGP9 AndroidAdapter shouldn't be necessary at all, since all information should be exposed via 'normal' KGP API (KotlinSourceSets and KotlinCompilations).

I'll try and remove AndroidKmpLibrary and report back if there are issues. If there are missing classpath JARs, we should probably report this as an AGP bug.

dokka-integration-tests/gradle/projects/it-android/build.gradle.kts

dokka-integration-tests/gradle/src/test/kotlin/AndroidKotlinMultiplatformBuiltInTest.kt

…are 'publishable' (#4231) DGP should only document 'publishable' (i.e. main, non-test) source sets. DGP needs to extract this information from KGP and AGP. For AGP projects, DPG currently uses `KotlinJvmAndroidCompilation.androidVariant` to determine publishability of a source set. However, [this is deprecated in KGP 2.2.10](https://github.com/JetBrains/kotlin/blob/v2.2.10/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt#L38-L39). It will eventually be removed. This is because AGP will implement Kotlin compilation internally (AKA Kotlin built-in). This PR uses an alternative AGP utility: `AndroidComponentsExtension`. DGP extracts Components from this extension and stores it in a separate data structure (to avoid Configuration Cache issues with serialising too much data). If a Component has at least one Variant, it is considered 'publishable'. Each Component is associated with a single KotlinCompilation (matched by name), and each KotlinSourceSet is associated with a list of KotlinCompilations. While using `AndroidComponentsExtension` is required for AGP9, it also works for AGP7 and 8. To reduce complexity, this PR uses the same approach for all AGP versions. --- This PR is the first part of supporting AGP 9 in DGP. The next PR is #4295, which will support and test AGP 9 with and without Kotlin built-in.

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/AndroidAdapter.kt

If a project has `kotlin-multiplatform` and `com.android.kotlin.multiplatform.library` then AndroidAdapter shouldn't be necessary. `compilationClasspath` already contains android.jar and the classpath from Android's Components.

Filter out KGP versions, specifically because com.android.kotlin.multiplatform.library requires KGP 2.0.0+

minor tweak to make it easier to see where the comments refer to

# Conflicts: # dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/junit/TestedVersionsSource.kt # dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/KotlinAdapter.kt # dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/findExtensionLenient.kt # dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/MultiModuleFunctionalTest.kt

adam-enko · 2025-11-18T12:18:37Z

Converted to a draft because I'm going to split this PR into smaller pieces.

Update test utils to support version filtering.
Updates to 'find extension lenient'.
Support AGP9.
Misc fixes.
Adding test projects.

Tag tests that use Kotlin JVM plugin. (This will become more relevant when we add a test for AGP9 with Kotlin-built-in.)

Move the `@WithGradleProperties` defaults to the tags that require them. The test classes are simpler. (This will become more relevant when we need to test AGP9 with built-in-kotlin.)

…ort-agp-kotlin-builtin # Conflicts: # dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/junit/testTags.kt # dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt # dokka-integration-tests/gradle/src/test/kotlin/AndroidProjectIT.kt # dokka-integration-tests/gradle/src/test/kotlin/MultiplatformAndroidJvmProjectIT.kt

# Conflicts: # dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/junit/testTags.kt # dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt # dokka-integration-tests/gradle/src/test/kotlin/MultiplatformAndroidJvmProjectIT.kt

# Conflicts: # build.gradle.kts # dokka-integration-tests/gradle/projects/it-android-kotlin-mp-builtin/build.gradle.kts # dokka-integration-tests/gradle/projects/it-android-kotlin-mp-builtin/gradle.properties # dokka-integration-tests/gradle/src/test/kotlin/AndroidKotlinMultiplatformBuiltInTest.kt

- Instead of lower-level manual version selection, instead defined whether a test project supports Kotlin built-in - Remove SemVerRange

… is not necessary since 9.0.0-alpha03.

…enerated It could be a bit of a pain to maintain? But it's quick and easy, and if it prevents a bug where a version is accidentally filtered out it'd be worth it. (we could use test coverage support, but this is a quick and easy one)

whyoleg and others added 11 commits August 18, 2025 14:43

Fix compatibility with changes in KGP

afb8b31

Merge branch 'master' into whyoleg/kgp-2.2.20-compatibility

20cabc8

WIP update KotlinAdapter, to determine whether an AGP source set is '…

3296827

…publishable'

tidy

6ed6540

tidy

144405d

Avoid java.lang.NoClassDefFoundError in findExtensionLenient.

a869239

rename file to match function name Update test.

limit fetching data unlesss KGP >= 2.2.10

e8cd21e

Add kdoc

Merge branch 'master' into adam/kgp-2.2.20-compatibility

4fbeeed

fix android variant typecheck

f8a02d6

rm unnecessary typealias AndroidComponentsExtension

f08f6ad

move comment about 'string based class comparison' to relevant part o…

3663dce

…f code

adam-enko self-assigned this Oct 14, 2025

adam-enko added the runner: Gradle plugin An issue/PR related to Dokka's Gradle plugin label Oct 14, 2025

adam-enko mentioned this pull request Oct 14, 2025

Fix classpath when source set has no metadata compilations #4296

Draft

adam-enko added 4 commits November 3, 2025 20:18

Merge branch 'master' into adam/kgp-2.2.20-compatibility

efa359a

bump tested KGP 2.2 version

d744657

add tested KGP 2.3 version

6642dab

remove condition usage of AndroidComponentsExtension

5554f87

adam-enko mentioned this pull request Nov 4, 2025

KGP 2.2.10 + AGP: Use Android components to determine if source-sets are 'publishable' #4231

Merged

adam-enko added 4 commits November 4, 2025 16:54

Merge branch 'master' into adam/kgp-2.2.20-compatibility

5bf6681

add more docs for collectAndroidVariants

6fca413

rm old kdoc reference

acd43cb

Merge branch 'master' into adam/kgp-2.2.20-compatibility

0758d2e

adam-enko changed the base branch from master to adam/kgp-2.2.20-compatibility November 5, 2025 09:24

adam-enko force-pushed the adam/support-agp-kotlin-builtin branch from 12c2bb1 to 4dd9e43 Compare November 5, 2025 09:26

adam-enko added 5 commits November 10, 2025 15:40

Merge branch 'master' into adam/kgp-2.2.20-compatibility

1f92f05

update comment about kotlin("jvm") apply false in test

2450422

Update test for inaccessible KotlinBasePlugin class

ee6ac18

Integration tests: support AGP 9 testing and version filtering

02b4c49

Preparation for testing AGP9. - Add min/max version to `@TestsAndroid` and `@TestsAndroidCompose` filter AGP versions. - Add SemVerRange to help with filtering. - Add AGP9 properties.

adam-enko added 2 commits November 11, 2025 22:45

tidy findExtensionLenient, remove redundant catches from findAndroi…

30faa76

…dComponentsExtension

update it-android-kotlin-mp-builtin test data

aee7a4b

whyoleg reviewed Nov 12, 2025

View reviewed changes

adam-enko added 2 commits November 12, 2025 10:34

update tested AGP versions: add 8.13 and bump patch versions

0bbcce2

agp 8.13 needs Gradle 8.13-9.0.0

4ebd56f

Base automatically changed from adam/kgp-2.2.20-compatibility to master November 12, 2025 16:14

ALikhachev reviewed Nov 12, 2025

View reviewed changes

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/AndroidAdapter.kt Outdated Show resolved Hide resolved

adam-enko added 5 commits November 17, 2025 13:37

Remove AndroidKmpLibrary

a5eb2d7

If a project has `kotlin-multiplatform` and `com.android.kotlin.multiplatform.library` then AndroidAdapter shouldn't be necessary. `compilationClasspath` already contains android.jar and the classpath from Android's Components.

add link to AGP issue regarding bootClasspath failure

cc62d32

DGP tests: support KGP version filtering

18578b9

Filter out KGP versions, specifically because com.android.kotlin.multiplatform.library requires KGP 2.0.0+

polish kotlinCompileDependencyFiles

0262759

minor tweak to make it easier to see where the comments refer to

adam-enko marked this pull request as draft November 18, 2025 12:17

adam-enko added 15 commits November 18, 2025 14:58

DGP integration tests: Add @TestsKotlinJvm tag

d82f4a9

Tag tests that use Kotlin JVM plugin. (This will become more relevant when we add a test for AGP9 with Kotlin-built-in.)

DGP integration tests: Move @WithGradleProperties to tags

43b2f7b

Move the `@WithGradleProperties` defaults to the tags that require them. The test classes are simpler. (This will become more relevant when we need to test AGP9 with built-in-kotlin.)

Merge branch 'master' into adam/support-agp-kotlin-builtin

6d2c0d8

wip

5e4e2e9

simplify AGP version filtering

7219760

- Instead of lower-level manual version selection, instead defined whether a test project supports Kotlin built-in - Remove SemVerRange

remove AndroidKotlinBuiltIn, and android.builtInKotlin. Enabling it…

c6397f2

… is not necessary since 9.0.0-alpha03.

variantsCompileClasspath: fix kdoc comment

42f6f10

revert SemVer changes

c61692e

update TestVersionsSourceTest

9058143

update default kotlinBuiltIn

c4bacd5

remove unnecessary project.plugins.withType<DokkaBasePlugin>().all { }

ea99612

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Support AGP with Kotlin Built-in #4295

Support AGP with Kotlin Built-in #4295

Uh oh!

adam-enko commented Oct 14, 2025 •

edited

Loading

Uh oh!

whyoleg Nov 12, 2025

Uh oh!

adam-enko Nov 12, 2025

Uh oh!

adam-enko Nov 20, 2025

Uh oh!

whyoleg Nov 12, 2025

Uh oh!

adam-enko Nov 12, 2025

Uh oh!

whyoleg Nov 12, 2025

Uh oh!

ALikhachev Nov 12, 2025 •

edited

Loading

Uh oh!

adam-enko Nov 13, 2025

Uh oh!

adam-enko Nov 17, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adam-enko commented Nov 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Support AGP with Kotlin Built-in #4295

Are you sure you want to change the base?

Support AGP with Kotlin Built-in #4295

Uh oh!

Conversation

adam-enko commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

Integration tests: support AGP 9 testing and version filtering

Uh oh!

whyoleg Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

adam-enko Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

adam-enko Nov 20, 2025

Choose a reason for hiding this comment

Uh oh!

whyoleg Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

adam-enko Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

whyoleg Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

ALikhachev Nov 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adam-enko Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

adam-enko Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adam-enko commented Nov 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

adam-enko commented Oct 14, 2025 •

edited

Loading

ALikhachev Nov 12, 2025 •

edited

Loading

adam-enko Nov 17, 2025 •

edited

Loading