[K2] Reorganize project model for MPP #3236
Merged
Conversation
This file contains 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
vmishenev
added
the
topic: K2
The tests, that have unresolved common symbols, are fixed by the new version of Analysis API.
vmishenev
commented
Oct 19, 2023
| @@ -125,30 +122,54 @@ class SinceKotlinTest : AbstractRenderingTest() { | |||
| val configuration = dokkaConfiguration { | |||
| sourceSets { | |||
| sourceSet { | |||
| sourceRoots = listOf("src/") | |||
| sourceRoots = listOf("src/jvm/") | |||
vmishenev
commented
Oct 19, 2023
| @@ -286,15 +285,15 @@ class LinkableContentTest : BaseAbstractTest() { | |||
| sourceSets { | |||
| sourceSet { | |||
| analysisPlatform = "js" | |||
| sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map { | |||
| sourceRoots = listOf("jsMain").map { | |||
vmishenev
commented
Oct 19, 2023
| @@ -60,15 +60,22 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt", | |||
| fun multiplatform() { | |||
| val configuration = dokkaConfiguration { | |||
| sourceSets { | |||
| val commonSourceSet = sourceSet { | |||
IgnatBeresnev
approved these changes
Oct 23, 2023
yanex
approved these changes
Oct 25, 2023
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.
We map Dokka's source set directly to a source module of Analysis API inside one Analysis Standalone session.
Analysis API session is created in
src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis.kt(seefun createAnalysisSession)Before the PR, one Dokka's source set corresponded to one Standalone API session with one source module that has source roots from dependent source sets.
The PR allows the enabling of some tests annotated with
OnlyDescriptorsMPP.Also, tests with
OnlyDescriptorsMPPthat have unresolved common symbols are fixed by the new version of Analysis API.