aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle/src/integrationTest/kotlin
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-23 15:11:15 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-07-23 15:53:45 +0200
commit10fbd60612b2668afa2e430851773741e6debcd6 (patch)
tree7087fa7aed781091d5710647292a8c219778eb3c /integration-tests/gradle/src/integrationTest/kotlin
parent4f11bcdb2bc8378a015663f9268984283ea18aad (diff)
downloaddokka-10fbd60612b2668afa2e430851773741e6debcd6.tar.gz
dokka-10fbd60612b2668afa2e430851773741e6debcd6.tar.bz2
dokka-10fbd60612b2668afa2e430851773741e6debcd6.zip
Update to Kotlin version 1.4.0-rc
Diffstat (limited to 'integration-tests/gradle/src/integrationTest/kotlin')
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt6
-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/BasicGroovyIntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.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/Multiplatform0GradleIntegrationTest.kt2
6 files changed, 8 insertions, 8 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 4ba01ee3..f9db9757 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
@@ -15,15 +15,15 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
@get:Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("6.5.1", "5.6.4"),
- kotlinVersions = listOf("1.3.72", "1.4-M3"),
+ kotlinVersions = listOf("1.3.72", "1.4.0-rc"),
androidGradlePluginVersions = listOf("3.5.3", "3.6.3")
) + BuildVersions.permutations(
gradleVersions = listOf("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.3.72", "1.4-M3"),
+ kotlinVersions = listOf("1.3.72", "1.4.0-rc"),
androidGradlePluginVersions = listOf("4.0.0")
) + BuildVersions.permutations(
gradleVersions = listOf("6.5.1"),
- kotlinVersions = listOf("1.3.72", "1.4-M3"),
+ kotlinVersions = listOf("1.3.72", "1.4.0-rc"),
androidGradlePluginVersions = listOf("4.1.0-beta02")
)
}
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 d31c23b6..5afb77e7 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("6.5.1", "6.4.1", "6.3", "6.2.2", "6.1.1", "6.0", "5.6.4"),
- kotlinVersions = listOf("1.3.30", "1.3.72", "1.4-M3")
+ kotlinVersions = listOf("1.3.30", "1.3.72", "1.4.0-rc")
)
}
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 24e105df..cc9ff506 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
@@ -16,7 +16,7 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("6.5.1", "5.6.4"),
- kotlinVersions = listOf("1.4-M3")
+ kotlinVersions = listOf("1.4.0-rc")
)
}
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 9866712d..453a42f3 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
@@ -11,7 +11,7 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.4-M3")
+ kotlinVersions = listOf("1.4.0-rc")
)
}
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 91afeaa0..7a535fe6 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("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.4-M3")
+ kotlinVersions = listOf("1.4.0-rc")
)
}
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 ae0f342c..97cf0612 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
@@ -12,7 +12,7 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions)
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.3.30", "1.3.72", "1.4-M3")
+ kotlinVersions = listOf("1.3.30", "1.3.72", "1.4.0-rc")
)
}