diff options
10 files changed, 21 insertions, 22 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29271bed..6c9a2247 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Jul 21 13:56:13 CEST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts b/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts index 26200399..a8d7b837 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts +++ b/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { sourceSets { named("commonMain") { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9") } } } diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index 6e199df5..80455dd0 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.4.0-rc +dokka_it_kotlin_version=1.4.0 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") ) } diff --git a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTaskTest.kt b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTaskTest.kt index 7885cea1..04dd1eed 100644 --- a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTaskTest.kt +++ b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTaskTest.kt @@ -26,7 +26,7 @@ class DokkaCollectorTaskTest { } project.tasks.withType<DokkaTask>().configureEach { task -> task.dokkaSourceSets.configureEach { sourceSet -> - sourceSet.classpath.setFrom() + sourceSet.classpath.setFrom(emptyList<Any>()) } } } |