diff options
author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2022-09-27 07:05:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-27 07:05:36 +0200 |
commit | a7750c6447230abb409a05bf1686c78632696df4 (patch) | |
tree | 9fd7b54bd27d9590046596a2fe6b165e59444567 /integration-tests/gradle/src/integrationTest/kotlin/org | |
parent | 86f9559ebd40a07e996df49464fc9101dd21d3bc (diff) | |
download | dokka-a7750c6447230abb409a05bf1686c78632696df4.tar.gz dokka-a7750c6447230abb409a05bf1686c78632696df4.tar.bz2 dokka-a7750c6447230abb409a05bf1686c78632696df4.zip |
Update Kotlin to 1.7.20-RC (#2682)
Diffstat (limited to 'integration-tests/gradle/src/integrationTest/kotlin/org')
2 files changed, 11 insertions, 11 deletions
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 ef9d67cc..241dc732 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 @@ -40,9 +40,9 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract return } - val reactPropertyArg = TestedVersions.KT_REACT_WRAPPER_MAPPING[versions.kotlinVersion] + val reactVersion = 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() + val result = createGradleRunner("-Preact_version=$reactVersion", "dokkaHtml", "-i", "-s").buildRelaxed() assertEquals(TaskOutcome.SUCCESS, assertNotNull(result.task(":dokkaHtml")).outcome) val htmlOutputDir = File(projectDir, "build/dokka/html") @@ -61,4 +61,4 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract assertNoEmptySpans(file) } } -}
\ No newline at end of file +} 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 index f8ec453e..18ebe427 100644 --- 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 @@ -5,7 +5,7 @@ internal object TestedVersions { val BASE = BuildVersions.permutations( gradleVersions = listOf("7.4.2", "6.9"), - kotlinVersions = listOf("1.7.10", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.20-RC", "1.6.21", "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")) @@ -18,20 +18,20 @@ internal object TestedVersions { val ANDROID = BuildVersions.permutations( gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")), - kotlinVersions = listOf("1.7.10", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.20-RC", "1.6.21", "1.5.31", "1.4.32"), androidGradlePluginVersions = listOf("7.2.0") ) + BuildVersions.permutations( gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")), - kotlinVersions = listOf("1.7.10", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.20-RC", "1.6.21", "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.21" to "-Preact_version=18.0.0-pre.332-kotlin-1.6.21", - "1.7.10" to "-Preact_version=18.2.0-pre.354" + "1.5.0" to "17.0.2-pre.204-kotlin-1.5.0", + "1.6.0" to "17.0.2-pre.280-kotlin-1.6.0", + "1.5.31" to "17.0.2-pre.265-kotlin-1.5.31", + "1.6.21" to "18.0.0-pre.332-kotlin-1.6.21", + "1.7.20-RC" to "18.2.0-pre.391", ) } |