diff options
Diffstat (limited to 'integration-tests/gradle')
33 files changed, 87 insertions, 95 deletions
diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties index 2bdf43b4..f368eb83 100644 --- a/integration-tests/gradle/projects/it-android-0/gradle.properties +++ b/integration-tests/gradle/projects/it-android-0/gradle.properties @@ -1,3 +1,3 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 dokka_it_android_gradle_plugin_version=4.0.0 android.useAndroidX=true diff --git a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties +++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties index 622ab64a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts index c9302653..f4585a87 100644 --- a/integration-tests/gradle/projects/it-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { } } -version = "1.5-SNAPSHOT" +version = "1.6.10-SNAPSHOT" apply(from = "../template.root.gradle.kts") diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-basic/gradle.properties +++ b/integration-tests/gradle/projects/it-basic/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties index 965a6b9e..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-collector-0/gradle.properties +++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts index 6f949766..ec366c9d 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts +++ b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts @@ -15,5 +15,8 @@ kotlin { dependencies { implementation(kotlin("stdlib")) implementation(npm("is-sorted", "1.0.5")) - implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom:${properties["dokka_it_react_kotlin_version"]}") + + val reactVersion = properties["react_version"] + implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion") + implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion") }
\ No newline at end of file diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties index 7ebac3ad..272e8f30 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties +++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties @@ -1 +1,2 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 +react_version=18.0.0-pre.325-kotlin-1.6.10 diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties index 965a6b9e..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt b/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt index b93e180e..81c66d54 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt +++ b/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt @@ -2,7 +2,6 @@ import org.w3c.dom.url.URLSearchParams import react.Props -import react.RComponent import react.State /** @@ -12,7 +11,8 @@ class RootPackageClass { val description = "I do live in the root package!" } -fun RComponent<*, *>.params() = URLSearchParams() +// sample method that uses classes from dom and react, should compile +fun URLSearchParams.react(props: Props, state: State) {} fun test(list: MutableList<Int>) = "list" diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-multimodule-1/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/build.gradle index aa46d030..57d22b79 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/build.gradle +++ b/integration-tests/gradle/projects/it-multimodule-1/build.gradle @@ -7,8 +7,8 @@ apply from: '../template.root.gradle.kts' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" - compile project(':first') - compile project(':second') + implementation project(':first') + implementation project(':second') } diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties index 80455dd0..04177526 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.4.0 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties index ba94df84..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties index 9f540b69..a4f2b91c 100644 --- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties @@ -1,2 +1,2 @@ -dokka_it_kotlin_version=1.4.0 -#org.gradle.debug = true +dokka_it_kotlin_version=1.6.10 + diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index 80455dd0..04177526 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.4.0 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt index 4352175f..8874bc58 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt @@ -11,19 +11,7 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", *ifExhaustive("5.6.4")), - kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")), - androidGradlePluginVersions = listOf("3.5.3", *ifExhaustive("3.6.3")) - ) + BuildVersions.permutations( - gradleVersions = listOf("6.6", *ifExhaustive("6.1.1")), - kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")), - androidGradlePluginVersions = listOf("4.0.0") - ) + BuildVersions.permutations( - gradleVersions = listOf("7.3"), - kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")), - androidGradlePluginVersions = listOf("7.0.0") - ) + val versions = TestedVersions.ANDROID } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt index 2207a13f..f47f7e2a 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt @@ -10,13 +10,7 @@ class BasicCachingIntegrationTest(override val versions: BuildVersions) : Abstra companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.0", *ifExhaustive("6.6", "6.1.1")), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0") - ) + BuildVersions.permutations( - gradleVersions = listOf("5.6.4", "6.0"), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.4.32")) - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt index b7930f67..58383805 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt @@ -10,13 +10,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.3", *ifExhaustive("7.2", "7.0", "6.6", "6.3", "6.2.2", "6.1.1")), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31", "1.6.0", "1.6.10") - ) + BuildVersions.permutations( - gradleVersions = listOf("5.6.4", "6.0"), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32")) - ) + val versions = TestedVersions.BASE } @BeforeTest @@ -162,7 +156,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac val indexFile = File(this, "index.html") assertTrue(indexFile.isFile, "Missing index.html") assertTrue( - """<title>Basic Project 1.5-SNAPSHOT API </title>""" in indexFile.readText(), + """<title>Basic Project 1.6.10-SNAPSHOT API </title>""" in indexFile.readText(), "Header with version number not present in index.html" ) diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt index 78e835eb..2a038f37 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt @@ -14,13 +14,7 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.0", "6.6"), - kotlinVersions = listOf("1.3.72", "1.4.0", "1.5.10") - ) + BuildVersions.permutations( - gradleVersions = listOf("5.6.4"), - kotlinVersions = listOf("1.4.0", "1.4.32") - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt index 12e6cfad..54035061 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt @@ -9,10 +9,7 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.0", "6.6", "6.1.1"), - kotlinVersions = listOf("1.5.10", "1.4.0") - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt index d82c3827..28b8d22c 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt @@ -10,13 +10,7 @@ class GradleRelocatedCachingIntegrationTest(override val versions: BuildVersions companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.0", *ifExhaustive("6.6", "6.1.1")), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0") - ) + BuildVersions.permutations( - gradleVersions = listOf("5.6.4", "6.0"), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.4.32")) - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt index c0d9bc93..ef9d67cc 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt @@ -10,16 +10,15 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.2", *ifExhaustive("7.0")), - kotlinVersions = listOf("1.5.0", "1.5.30", "1.5.31") - ) + val versions = TestedVersions.BASE } - val reactVersionArg = mapOf( - "1.5.0" to "-Pdokka_it_react_kotlin_version=5.2.0-pre.202-kotlin-1.5.0", - "1.5.30" to "-Pdokka_it_react_kotlin_version=5.2.0-pre.246-kotlin-1.5.30", - "1.5.31" to "-Pdokka_it_react_kotlin_version=5.2.0-pre.251-kotlin-1.5.31" + private val ignoredKotlinVersions = setOf( + // There were some breaking refactoring changes in kotlin react wrapper libs in 1.4.0 -> 1.5.0, + // some core react classes were moved from `react-router-dom` to `react` artifacts. + // Writing an integration test project that would work for both 1.4.0 and 1.5.0 would involve + // ugly solutions, so these versions are ignored. Not a big loss given they are deprecated as of this moment. + "1.4.0", "1.4.32" ) @BeforeTest @@ -37,7 +36,11 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract @Test fun execute() { - val reactPropertyArg = reactVersionArg[versions.kotlinVersion] + if (ignoredKotlinVersions.contains(versions.kotlinVersion)) { + return + } + + val reactPropertyArg = TestedVersions.KT_REACT_WRAPPER_MAPPING[versions.kotlinVersion] ?: throw IllegalStateException("Unspecified version of react for kotlin " + versions.kotlinVersion) val result = createGradleRunner(reactPropertyArg, "dokkaHtml", "-i", "-s").buildRelaxed() assertEquals(TaskOutcome.SUCCESS, assertNotNull(result.task(":dokkaHtml")).outcome) diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt index 35823a91..3c0bc5a5 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt @@ -9,10 +9,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.3", "7.2", "7.0", "6.6", "6.1.1"), - kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", "1.5.0", "1.4.0") - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt index 76be6cb8..ffc4705a 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt @@ -12,10 +12,7 @@ class MultiModule1IntegrationTest(override val versions: BuildVersions) : Abstra companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "6.6", "6.1.1"), - kotlinVersions = listOf("1.6.10", "1.4.0") - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt index 8f7ccbd3..55f4ce64 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt @@ -10,10 +10,7 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions) companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "6.1.1"), - kotlinVersions = listOf("1.4.0") - ) + val versions = TestedVersions.BASE } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt new file mode 100644 index 00000000..85f40cb7 --- /dev/null +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -0,0 +1,36 @@ +package org.jetbrains.dokka.it.gradle + +internal object TestedVersions { + + val BASE = + BuildVersions.permutations( + gradleVersions = listOf("7.3", "6.9"), + kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"), + ) + BuildVersions.permutations( + gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")), + kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0")) + ) + + /** + * Starting with version 7, major android gradle plugin versions are aligned + * with major gradle versions, i.e android plugin 7.0.0 will not work with gradle 6.9 + */ + val ANDROID = + BuildVersions.permutations( + gradleVersions = listOf("7.3", *ifExhaustive("7.0")), + kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"), + androidGradlePluginVersions = listOf("7.0.0") + ) + BuildVersions.permutations( + gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")), + kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"), + androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3")) + ) + + // https://mvnrepository.com/artifact/org.jetbrains.kotlin-wrappers/kotlin-react + val KT_REACT_WRAPPER_MAPPING = mapOf( + "1.5.0" to "-Preact_version=17.0.2-pre.204-kotlin-1.5.0", + "1.6.0" to "-Preact_version=17.0.2-pre.280-kotlin-1.6.0", + "1.5.31" to "-Preact_version=17.0.2-pre.265-kotlin-1.5.31", + "1.6.10" to "-Preact_version=18.0.0-pre.325-kotlin-1.6.10", + ) +}
\ No newline at end of file diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt index 56da7bc9..b9cd7c29 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt @@ -10,10 +10,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = BuildVersions.permutations( - gradleVersions = listOf("7.0", "7.3"), - kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", "1.5.0") - ) + val versions = TestedVersions.BASE } @BeforeTest |