aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka
diff options
context:
space:
mode:
authorMarcin Aman <marcin.aman@gmail.com>2021-10-04 12:42:43 +0200
committerGitHub <noreply@github.com>2021-10-04 13:42:43 +0300
commit120e1fb21076afc814cc84b2b691b6946d28f7c0 (patch)
treed7250209bc88058a7315b7358db16c4884ebe612 /integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka
parent8f97b049f23b8a6950fc41badc544ad1b636636a (diff)
downloaddokka-120e1fb21076afc814cc84b2b691b6946d28f7c0.tar.gz
dokka-120e1fb21076afc814cc84b2b691b6946d28f7c0.tar.bz2
dokka-120e1fb21076afc814cc84b2b691b6946d28f7c0.zip
Bump to Kotlin 1.5.31 (#2164)
* Bump to Kotlin 1.5.31 * Mark todo-s as unsupported * Add PsiNameHelper * Try disabling ProjectFileIndex * Remove CoreProjectFileIndex * Update JDKs to 17, kotlin to 1.5.31 in integration tests * Update Kotlin to 1.5.31 in JS IR integration test Co-authored-by: vmishenev <vad-mishenev@yandex.ru>
Diffstat (limited to 'integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka')
-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/JsIRGradleIntegrationTest.kt5
-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
5 files changed, 7 insertions, 6 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 ea4d2edd..b8cf5097 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.30", *ifExhaustive("1.4.0", "1.3.72")),
+ kotlinVersions = listOf("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 297a1618..e6fa87ff 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.30")
+ kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31")
) + 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/JsIRGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt
index 81beccee..c0d9bc93 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
@@ -12,13 +12,14 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract
@get:Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("7.2", *ifExhaustive("7.0")),
- kotlinVersions = listOf("1.5.0", "1.5.30")
+ kotlinVersions = listOf("1.5.0", "1.5.30", "1.5.31")
)
}
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.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"
)
@BeforeTest
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 cb4a2ec1..8c1d157b 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.30", "1.5.0", "1.4.0")
+ kotlinVersions = listOf("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 6e594edd..bb83cf3d 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.30", "1.5.0")
+ kotlinVersions = listOf("1.5.31", "1.5.0")
)
}