Skip to content

Commit 8a1b36b

Browse files
authored
Use JVM platform if the source-set is shared between jvm and android-jvm targets (#4258)
* Infer analysis platform as `JVM` if the source-set is shared between jvm and android-jvm * Add IT for android+jvm shared classes case
1 parent 39ae791 commit 8a1b36b

File tree

80 files changed

+4200
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+4200
-2
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ idea {
123123

124124
"dokka-integration-tests/gradle/src/testExampleProjects/expectedData",
125125
"dokka-integration-tests/gradle/projects/it-android/expectedData",
126+
"dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData",
126127
"dokka-integration-tests/gradle/projects/it-android-compose/expectedData",
127128
"dokka-integration-tests/gradle/projects/it-kotlin-multiplatform/expectedData",
128129

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
plugins {
2+
id("com.android.library") version "/* %{AGP_VERSION} */"
3+
id("org.jetbrains.dokka") version "/* %{DGP_VERSION} */"
4+
kotlin("multiplatform") version "/* %{KGP_VERSION} */"
5+
}
6+
7+
android {
8+
namespace = "org.jetbrains.dokka.it.android"
9+
defaultConfig {
10+
minSdkVersion(21)
11+
setCompileSdkVersion(29)
12+
}
13+
}
14+
15+
kotlin {
16+
jvm()
17+
androidTarget()
18+
19+
sourceSets {
20+
val androidAndJvmMain by registering
21+
jvmMain {
22+
dependsOn(androidAndJvmMain.get())
23+
}
24+
androidMain {
25+
dependsOn(androidAndJvmMain.get())
26+
}
27+
}
28+
}

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/abstract-class-kotlin.svg

Lines changed: 26 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/abstract-class.svg

Lines changed: 22 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/anchor-copy-icon.svg

Lines changed: 6 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/annotation-kotlin.svg

Lines changed: 13 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/annotation.svg

Lines changed: 9 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/arrow-down.svg

Lines changed: 3 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/burger.svg

Lines changed: 5 additions & 0 deletions
Loading

dokka-integration-tests/gradle/projects/it-multiplatform-android-jvm/expectedData/html/images/check.svg

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)