diff options
Diffstat (limited to 'integration-tests/gradle/src/integrationTest')
12 files changed, 32 insertions, 20 deletions
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt index ada6c26c..66a13f7e 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt @@ -10,7 +10,7 @@ class BasicCachingIntegrationTest(override val versions: BuildVersions) : Abstra companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest 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 2e48447a..50ab213c 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 @@ -10,7 +10,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest 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 2a038f37..e54a140c 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 @@ -14,7 +14,7 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest 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 54035061..0a0a48f7 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 @@ -9,7 +9,7 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt index 2ac129af..b45caf77 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt @@ -10,7 +10,7 @@ class GradleRelocatedCachingIntegrationTest(override val versions: BuildVersions companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest 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 241dc732..25986c88 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 @@ -10,7 +10,7 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract companion object { @get:JvmStatic @get:Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } private val ignoredKotlinVersions = setOf( 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 3c0bc5a5..497dee0e 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 @@ -9,7 +9,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt index ffc4705a..8786e0da 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt @@ -12,7 +12,7 @@ class MultiModule1IntegrationTest(override val versions: BuildVersions) : Abstra companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest 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 55f4ce64..e73f6c82 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 @@ -10,7 +10,7 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions) companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt index 2b8e5b3c..82dc79e2 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -2,19 +2,29 @@ package org.jetbrains.dokka.it.gradle internal object TestedVersions { - val LATEST = BuildVersions("7.4.2", "1.7.20") - val BASE = + val LATEST = BuildVersions("7.4.2", "1.8.10") + + /** + * All supported Gradle/Kotlin versions, including [LATEST] + * + * [Kotlin/Gradle compatibility matrix](https://docs.gradle.org/current/userguide/compatibility.html#kotlin) + */ + val ALL_SUPPORTED = BuildVersions.permutations( - gradleVersions = listOf("7.4.2", "6.9"), + gradleVersions = listOf("6.9"), kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"), ) + BuildVersions.permutations( gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")), - kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0")) - ) + kotlinVersions = listOf(*ifExhaustive("1.7.0", "1.6.0", "1.5.0", "1.4.0")) + ) + LATEST /** - * Starting with version 7, major android gradle plugin versions are aligned - * with major gradle versions, i.e android plugin 7.0.0 will not work with gradle 6.9 + * Supported Android/Gradle/Kotlin versions, including [LATEST] + * + * Starting with version 7, major Android Gradle Plugin versions are aligned + * with major Gradle versions, i.e AGP 7.X will only work with Gradle 7.X + * + * [AGP/Gradle compatibility matrix](https://developer.android.com/studio/releases/gradle-plugin#updating-gradle) */ val ANDROID = BuildVersions.permutations( @@ -23,9 +33,9 @@ internal object TestedVersions { androidGradlePluginVersions = listOf("7.2.0") ) + BuildVersions.permutations( gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")), - kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.8.0", "1.7.0", "1.6.0", "1.5.0", "1.4.0"), androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3")) - ) + ) + LATEST // https://mvnrepository.com/artifact/org.jetbrains.kotlin-wrappers/kotlin-react val KT_REACT_WRAPPER_MAPPING = mapOf( @@ -34,5 +44,7 @@ internal object TestedVersions { "1.5.31" to "17.0.2-pre.265-kotlin-1.5.31", "1.6.21" to "18.0.0-pre.332-kotlin-1.6.21", "1.7.20" to "18.2.0-pre.391", + "1.8.0" to "18.2.0-pre.467", + "1.8.10" to "18.2.0-pre.490", ) } 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 b9cd7c29..d6b23981 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 @@ -10,7 +10,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") - val versions = TestedVersions.BASE + val versions = TestedVersions.ALL_SUPPORTED } @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt index 0b727a29..65055623 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt @@ -16,7 +16,7 @@ class CoroutinesGradleIntegrationTest(override val versions: BuildVersions) : Ab @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( gradleVersions = listOf("7.4.2"), - kotlinVersions = listOf("1.7.10") + kotlinVersions = listOf("1.8.10") ) } |