Only apply 'Adapter' plugins once, and group PluginIds #4362
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The AndroidAdapter, JavaAdapter, and KotlinAdapters apply their configuration multiple times. Currently, this is acceptable because a project cannot have multiple Android/Kotlin/Java plugins applied. But the situation gets more complicated with AGP9 and kotlin-built-in. The kotlin-built-in plugin uses an implementation of `KotlinBasePlugin`, so the Android and Kotlin adapters could get applied multiple times, and some of their operations (registering DokkaSourceSets) aren't idempotent. I also updated the JavaAdapter to use the same approach for consistency (it's not strictly necessary). --- Also, group the plugin IDs into Sets, so they can be accessed at once without needing to remember which IDs should be accessed.
adam-enko
added
the
runner: Gradle plugin
…ent multiple warnings
adam-enko
force-pushed
the
adam/feat/dgp-apply-adapters-once
branch
from
45e9247 to
c29ad27
Compare
adam-enko
force-pushed
the
adam/feat/dgp-apply-adapters-once
branch
from
1104755 to
9daa1b9
Compare
adam-enko
force-pushed
the
adam/feat/dgp-apply-adapters-once
branch
from
9daa1b9 to
f271673
Compare
whyoleg
approved these changes
Nov 20, 2025
dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/PluginId.kt
Outdated
Show resolved
Hide resolved
dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/PluginId.kt
Outdated
Show resolved
Hide resolved
dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/PluginId.kt
Outdated
Show resolved
Hide resolved
(Adding them is not strictly related to this PR. They're added as part of the larger initiative of AGP9 support. We're not adding tests for them because I can't find any up-to-date examples, but they should just work.)
ALikhachev
approved these changes
Nov 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The AndroidAdapter, JavaAdapter, and KotlinAdapters apply their configuration multiple times.
Currently, this is acceptable because a project cannot have multiple Android/Kotlin/Java plugins applied.
But the situation gets more complicated with AGP9 and kotlin-built-in.
The kotlin-built-in plugin uses an implementation of
KotlinBasePlugin,so the Android and Kotlin adapters could get applied multiple times, and some of their operations (registering DokkaSourceSets) aren't idempotent.
I also updated the JavaAdapter to use the same approach for consistency (it's not strictly necessary).
Also, group the plugin IDs into Sets, so they can be accessed at once without needing to remember which IDs should be accessed.