aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle/src/integrationTest
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-08-14 14:45:50 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-08-14 18:56:39 +0200
commitb19ce3c7622666bd638baf2f840e898bb00efd90 (patch)
tree7451e09ace0039b67f8e466186a7b0b53ed73cc9 /integration-tests/gradle/src/integrationTest
parentb856a67e4bea18bb3929ede72aa19b6e80cccfd1 (diff)
downloaddokka-b19ce3c7622666bd638baf2f840e898bb00efd90.tar.gz
dokka-b19ce3c7622666bd638baf2f840e898bb00efd90.tar.bz2
dokka-b19ce3c7622666bd638baf2f840e898bb00efd90.zip
Update Gradle version to 6.6
Diffstat (limited to 'integration-tests/gradle/src/integrationTest')
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt12
-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/BasicGroovyIntegrationTest.kt4
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.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/Multiplatform0GradleIntegrationTest.kt4
6 files changed, 16 insertions, 16 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 a657e9c7..6d71f161 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
@@ -14,16 +14,16 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("6.5.1", *ifExhaustive("5.6.4")),
- kotlinVersions = listOf("1.4.0-rc", *ifExhaustive("1.3.72")),
+ gradleVersions = listOf("6.6", *ifExhaustive("5.6.4")),
+ kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")),
androidGradlePluginVersions = listOf("3.5.3", *ifExhaustive("3.6.3"))
) + BuildVersions.permutations(
- gradleVersions = listOf("6.5.1", *ifExhaustive("6.1.1")),
- kotlinVersions = listOf("1.4.0-rc", *ifExhaustive("1.3.72")),
+ gradleVersions = listOf("6.6", *ifExhaustive("6.1.1")),
+ kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")),
androidGradlePluginVersions = listOf("4.0.0")
) + BuildVersions.permutations(
- gradleVersions = listOf("6.5.1"),
- kotlinVersions = listOf("1.4.0-rc", *ifExhaustive("1.3.72")),
+ gradleVersions = listOf("6.6"),
+ kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")),
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 60f03d0f..afe0c1e8 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("6.5.1", *ifExhaustive("6.4.1", "6.3", "6.2.2", "6.1.1", "6.0"), "5.6.4"),
- kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72"), "1.4.0-rc")
+ gradleVersions = listOf("6.6", *ifExhaustive("6.4.1", "6.3", "6.2.2", "6.1.1", "6.0"), "5.6.4"),
+ kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72"), "1.4.0")
)
}
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 cc9ff506..4e452be8 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
@@ -15,8 +15,8 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("6.5.1", "5.6.4"),
- kotlinVersions = listOf("1.4.0-rc")
+ gradleVersions = listOf("6.6", "5.6.4"),
+ kotlinVersions = listOf("1.4.0")
)
}
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 453a42f3..9ca56536 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
@@ -10,8 +10,8 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.4.0-rc")
+ gradleVersions = listOf("6.6", "6.1.1"),
+ kotlinVersions = listOf("1.4.0")
)
}
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 0184d150..c682d241 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("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.4.0-rc")
+ gradleVersions = listOf("6.6", "6.1.1"),
+ kotlinVersions = listOf("1.4.0")
)
}
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 0e9a32fb..3109241a 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
@@ -11,8 +11,8 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions)
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
- gradleVersions = listOf("6.5.1", "6.1.1"),
- kotlinVersions = listOf("1.4.0-rc")
+ gradleVersions = listOf("6.6", "6.1.1"),
+ kotlinVersions = listOf("1.4.0")
)
}