Skip to content

Commit 55dfa07

Browse files
committed
Fix Multiplatform0GradleIntegrationTest
1 parent bba9690 commit 55dfa07

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

integration-tests/gradle/projects/it-multiplatform-0/gradle.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@
33
#
44

55
dokka_it_kotlin_version=1.9.10
6-
#these flags are enabled by default since 1.6.20.
7-
#remove when this test is executed with Kotlin >= 1.6.20
8-
kotlin.mpp.enableGranularSourceSetsMetadata=true
9-
kotlin.native.enableDependencyPropagation=false

integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,19 @@ class Multiplatform0GradleIntegrationTest : AbstractGradleIntegrationTest() {
2727
@ParameterizedTest(name = "{0}")
2828
@ArgumentsSource(AllSupportedTestedVersionsArgumentsProvider::class)
2929
fun execute(buildVersions: BuildVersions) {
30-
val result = createGradleRunner(buildVersions, "dokkaHtml", "-i", "-s").buildRelaxed()
30+
// `enableGranularSourceSetsMetadata` and `enableDependencyPropagation` flags are enabled by default since 1.6.20.
31+
// remove when this test is executed with Kotlin >= 1.6.20
32+
val result = if (buildVersions.kotlinVersion < "1.6.20")
33+
createGradleRunner(
34+
buildVersions,
35+
"dokkaHtml",
36+
"-i",
37+
"-s",
38+
"-Pkotlin.mpp.enableGranularSourceSetsMetadata=true",
39+
"-Pkotlin.native.enableDependencyPropagation=false"
40+
).buildRelaxed()
41+
else
42+
createGradleRunner(buildVersions, "dokkaHtml", "-i", "-s").buildRelaxed()
3143

3244
assertEquals(TaskOutcome.SUCCESS, assertNotNull(result.task(":dokkaHtml")).outcome)
3345

0 commit comments

Comments
 (0)