From fe9430a5a9d93613977d989c5f1fb24f112d790c Mon Sep 17 00:00:00 2001 From: "Vadim.Mishenev" Date: Sat, 4 Nov 2023 20:43:36 +0200 Subject: [PATCH] Update integration tests --- .../gradle/projects/it-android-0/gradle.properties | 2 +- .../gradle/projects/it-basic-groovy/gradle.properties | 2 +- integration-tests/gradle/projects/it-basic/build.gradle.kts | 2 +- integration-tests/gradle/projects/it-basic/gradle.properties | 2 +- .../gradle/projects/it-collector-0/gradle.properties | 2 +- .../gradle/projects/it-configuration/build.gradle.kts | 2 +- .../gradle/projects/it-configuration/gradle.properties | 2 +- .../gradle/projects/it-js-ir-0/gradle.properties | 2 +- .../gradle/projects/it-multimodule-0/gradle.properties | 2 +- .../gradle/projects/it-multimodule-1/gradle.properties | 2 +- .../projects/it-multimodule-versioning-0/gradle.properties | 2 +- .../gradle/projects/it-multiplatform-0/gradle.properties | 2 +- .../it-sequential-tasks-execution-stress/gradle.properties | 2 +- .../gradle/projects/it-wasm-basic/gradle.properties | 2 +- .../jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt | 2 +- .../kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 4 ++-- integration-tests/maven/projects/it-maven/pom.xml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties index 6f34e9b0f3..286fe3c342 100644 --- a/integration-tests/gradle/projects/it-android-0/gradle.properties +++ b/integration-tests/gradle/projects/it-android-0/gradle.properties @@ -2,6 +2,6 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 dokka_it_android_gradle_plugin_version=4.2.2 android.useAndroidX=true diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties +++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts index 5cb354f4a0..c30e0402a0 100644 --- a/integration-tests/gradle/projects/it-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts @@ -20,7 +20,7 @@ buildscript { } } -version = "1.9.10-SNAPSHOT" +version = "1.9.20-SNAPSHOT" apply(from = "../template.root.gradle.kts") diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-basic/gradle.properties +++ b/integration-tests/gradle/projects/it-basic/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-collector-0/gradle.properties +++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-configuration/build.gradle.kts b/integration-tests/gradle/projects/it-configuration/build.gradle.kts index 76e3f6512a..736202bb3b 100644 --- a/integration-tests/gradle/projects/it-configuration/build.gradle.kts +++ b/integration-tests/gradle/projects/it-configuration/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { } } -version = "1.9.10-SNAPSHOT" +version = "1.9.20-SNAPSHOT" apply(from = "../template.root.gradle.kts") diff --git a/integration-tests/gradle/projects/it-configuration/gradle.properties b/integration-tests/gradle/projects/it-configuration/gradle.properties index 36aa0558dd..f958d9e3f3 100644 --- a/integration-tests/gradle/projects/it-configuration/gradle.properties +++ b/integration-tests/gradle/projects/it-configuration/gradle.properties @@ -2,6 +2,6 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 fail_on_warning=false report_undocumented=false diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties index 63c36faeea..a7b64215c1 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties +++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties @@ -2,5 +2,5 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 react_version=18.2.0-pre.467 diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties index 504f59b0c3..a8c5975370 100644 --- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties @@ -2,5 +2,5 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties index 713c80d685..c49881b923 100644 --- a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties +++ b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties @@ -2,5 +2,5 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 task_number=100 diff --git a/integration-tests/gradle/projects/it-wasm-basic/gradle.properties b/integration-tests/gradle/projects/it-wasm-basic/gradle.properties index 1e2686effb..5904fc210f 100644 --- a/integration-tests/gradle/projects/it-wasm-basic/gradle.properties +++ b/integration-tests/gradle/projects/it-wasm-basic/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=1.9.10 +dokka_it_kotlin_version=1.9.20 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 a23fb41037..f2c1de0e0f 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 @@ -158,7 +158,7 @@ class BasicGradleIntegrationTest : AbstractGradleIntegrationTest() { val indexFile = File(this, "index.html") assertTrue(indexFile.isFile, "Missing index.html") assertTrue( - """Basic Project 1.9.10-SNAPSHOT API """ in indexFile.readText(), + """Basic Project 1.9.20-SNAPSHOT API """ in indexFile.readText(), "Header with version number not present in index.html" ) 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 e4634c0911..7c3ea4dfaf 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 @@ -14,7 +14,7 @@ internal open class AllSupportedTestedVersionsArgumentsProvider : TestedVersions internal object TestedVersions { - val LATEST = BuildVersions("7.6.2", "1.9.20-RC2") + val LATEST = BuildVersions("7.6.2", "1.9.20") /** * All supported Gradle/Kotlin versions, including [LATEST] @@ -61,7 +61,7 @@ internal object TestedVersions { "1.8.20" to "18.2.0-pre.546", "1.9.0" to "18.2.0-pre.597", "1.9.10" to "18.2.0-pre.597", - "1.9.20-RC2" to "18.2.0-pre.635", + "1.9.20" to "18.2.0-pre.635", ) } diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml index 3e20bf5395..6246e27abf 100644 --- a/integration-tests/maven/projects/it-maven/pom.xml +++ b/integration-tests/maven/projects/it-maven/pom.xml @@ -11,7 +11,7 @@ 1.0-SNAPSHOT - 1.9.20-RC + 1.9.20