aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle/src/integrationTest
diff options
context:
space:
mode:
authorvmishenev <vad-mishenev@yandex.ru>2021-10-18 12:20:51 +0300
committerGitHub <noreply@github.com>2021-10-18 12:20:51 +0300
commitef1afa98dfd48a893319b5b139fb69365dcb7088 (patch)
treee080df0c4d8847ae9cb3b51c3f26b34aa0cd34ad /integration-tests/gradle/src/integrationTest
parentb85bc284d71b51e76f8c4388ee6c20b86385c14e (diff)
downloaddokka-ef1afa98dfd48a893319b5b139fb69365dcb7088.tar.gz
dokka-ef1afa98dfd48a893319b5b139fb69365dcb7088.tar.bz2
dokka-ef1afa98dfd48a893319b5b139fb69365dcb7088.zip
Bump Kotlin to 1.6.0-RC (#2189)
* Bump Kotlin to 1.6.0-RC * Update Kotlin to 1.6.0-RC in integration tests * Change Dokka Version
Diffstat (limited to 'integration-tests/gradle/src/integrationTest')
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt2
4 files changed, 4 insertions, 4 deletions
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 b8cf5097..fbebde7d 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
@@ -21,7 +21,7 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
androidGradlePluginVersions = listOf("4.0.0")
) + BuildVersions.permutations(
gradleVersions = listOf("7.0"),
- kotlinVersions = listOf("1.5.31", *ifExhaustive("1.4.0", "1.3.72")),
+ kotlinVersions = listOf("1.6.0-RC", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")),
androidGradlePluginVersions = listOf("4.2.0")
)
}
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 e6fa87ff..4583a111 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
@@ -12,7 +12,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
@get:Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("7.2", *ifExhaustive("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")
+ kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31", "1.6.0-RC")
) + BuildVersions.permutations(
gradleVersions = listOf("5.6.4", "6.0"),
kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"))
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 8c1d157b..dd25a08b 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
@@ -11,7 +11,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("7.2", "7.0", "6.6", "6.1.1"),
- kotlinVersions = listOf("1.5.31", "1.5.0", "1.4.0")
+ kotlinVersions = listOf("1.6.0-RC", "1.5.31", "1.5.0", "1.4.0")
)
}
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 bb83cf3d..0768f734 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
@@ -12,7 +12,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("7.0", "7.2"),
- kotlinVersions = listOf("1.5.31", "1.5.0")
+ kotlinVersions = listOf("1.6.0-RC", "1.5.31", "1.5.0")
)
}