aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle
diff options
context:
space:
mode:
authorMarcin Aman <marcin.aman@gmail.com>2021-08-26 14:48:12 +0200
committerMarcin Aman <marcin.aman@gmail.com>2021-08-26 14:48:12 +0200
commit8e1848edfa24acb6b12fad067a6cedbb7be0426b (patch)
tree11c155f00776c1439c70a0029a26282b8e9eb8c1 /integration-tests/gradle
parent622d59822e709438802b72d82afef025b43dd564 (diff)
downloaddokka-8e1848edfa24acb6b12fad067a6cedbb7be0426b.tar.gz
dokka-8e1848edfa24acb6b12fad067a6cedbb7be0426b.tar.bz2
dokka-8e1848edfa24acb6b12fad067a6cedbb7be0426b.zip
Update versions in integration tests
Diffstat (limited to 'integration-tests/gradle')
-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.kt4
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt4
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt4
4 files changed, 9 insertions, 9 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 216ff395..ea4d2edd 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
@@ -20,9 +20,9 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")),
androidGradlePluginVersions = listOf("4.0.0")
) + BuildVersions.permutations(
- gradleVersions = listOf("6.6"),
- kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")),
- androidGradlePluginVersions = listOf("4.1.0-beta02")
+ gradleVersions = listOf("7.0"),
+ kotlinVersions = listOf("1.5.30", *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 1322356f..297a1618 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
@@ -11,8 +11,8 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("7.0", *ifExhaustive("6.6", "6.4.1", "6.3", "6.2.2", "6.1.1")),
- kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.10")
+ 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")
) + 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 7806ad5a..cb4a2ec1 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
@@ -10,8 +10,8 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("7.0", "6.6", "6.1.1"),
- kotlinVersions = listOf("1.5.10", "1.4.0")
+ gradleVersions = listOf("7.2", "7.0", "6.6", "6.1.1"),
+ kotlinVersions = listOf("1.5.30", "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 846dcc55..6e594edd 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
@@ -11,8 +11,8 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("7.0"),
- kotlinVersions = listOf("1.5.0")
+ gradleVersions = listOf("7.0", "7.2"),
+ kotlinVersions = listOf("1.5.30", "1.5.0")
)
}