aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-16 11:44:25 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-07-16 12:48:18 +0200
commit47e5f565d28f1bf1a5a822e8f30f989abc2ced99 (patch)
treed8cb5c7d283fa467092ab9a52e009a24685b3977
parent3ed507af8645d9f03331e150e87b2b6d937eb02f (diff)
downloaddokka-47e5f565d28f1bf1a5a822e8f30f989abc2ced99.tar.gz
dokka-47e5f565d28f1bf1a5a822e8f30f989abc2ced99.tar.bz2
dokka-47e5f565d28f1bf1a5a822e8f30f989abc2ced99.zip
Use kotlin "1.4-M3" artifact
-rw-r--r--gradle.properties2
-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/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/gradle.properties b/gradle.properties
index 3d00dff9..81b55546 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ dokka_version_base=1.4-M3
dokka_publication_channel=dokka
# Kotlin compiler and plugin
-kotlin_version=1.4-M3-eap-197
+kotlin_version=1.4-M3
kotlin_plugin_version=1.4-M3-release-207
coroutines_version=1.3.7-1.4-M3
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 30c3d07f..2a9d7a70 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-M2-eap-70"),
+ kotlinVersions = listOf("1.3.72", "1.4-M3"),
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-M2-eap-70"),
+ kotlinVersions = listOf("1.3.72", "1.4-M3"),
androidGradlePluginVersions = listOf("4.0.0")
) + BuildVersions.permutations(
gradleVersions = listOf("6.5.1"),
- kotlinVersions = listOf("1.3.72", "1.4-M2-eap-70"),
+ kotlinVersions = listOf("1.3.72", "1.4-M3"),
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 929c99aa..30b560e7 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-M2-eap-70")
+ kotlinVersions = listOf("1.3.30", "1.3.72", "1.4-M3")
)
}
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 0d812ca9..92b7ec40 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-M2-eap-70")
+ kotlinVersions = listOf("1.4-M3")
)
}
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 64cf3d75..390db3a0 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-M2-eap-70")
+ kotlinVersions = listOf("1.4-M3")
)
}
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 d6d2ff6a..6a3b9c83 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-M2-eap-70")
+ kotlinVersions = listOf("1.3.30", "1.3.72", "1.4-M3")
)
}