aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle
diff options
context:
space:
mode:
authorIgnat Beresnev <ignat.beresnev@jetbrains.com>2022-04-15 12:45:15 +0300
committerGitHub <noreply@github.com>2022-04-15 12:45:15 +0300
commit48b5918c2d465b482de4f070879b5ad93cc248b3 (patch)
tree4921a58ea50e323b81dadf180a91e51be0f50946 /integration-tests/gradle
parent334c9e14dff14f0eb08bda10bac9e622aa132afc (diff)
downloaddokka-48b5918c2d465b482de4f070879b5ad93cc248b3.tar.gz
dokka-48b5918c2d465b482de4f070879b5ad93cc248b3.tar.bz2
dokka-48b5918c2d465b482de4f070879b5ad93cc248b3.zip
Update documentation, examples and test references to 1.6.20 (#2440)
* Update documentation/example/test references to 1.6.20 * Mute Multiplatform0GradleIntegrationTest due to missing KLIB support * Update gradle and AGP versions to the latest
Diffstat (limited to 'integration-tests/gradle')
-rw-r--r--integration-tests/gradle/projects/it-android-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-basic-groovy/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-basic/build.gradle.kts2
-rw-r--r--integration-tests/gradle/projects/it-basic/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-collector-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-js-ir-0/gradle.properties4
-rw-r--r--integration-tests/gradle/projects/it-multimodule-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-multimodule-1/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-multiplatform-0/gradle.properties2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt1
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt13
13 files changed, 20 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 f368eb83..c9328126 100644
--- a/integration-tests/gradle/projects/it-android-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-android-0/gradle.properties
@@ -1,3 +1,3 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
dokka_it_android_gradle_plugin_version=4.0.0
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 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
+++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index f4585a87..a25f2262 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
}
}
-version = "1.6.10-SNAPSHOT"
+version = "1.6.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 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-basic/gradle.properties
+++ b/integration-tests/gradle/projects/it-basic/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-collector-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
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 272e8f30..7c5ca4ee 100644
--- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
@@ -1,2 +1,2 @@
-dokka_it_kotlin_version=1.6.10
-react_version=18.0.0-pre.325-kotlin-1.6.10
+dokka_it_kotlin_version=1.6.20
+react_version=18.0.0-pre.329-kotlin-1.6.20
diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.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 a4f2b91c..1b545223 100644
--- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
@@ -1,2 +1,2 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
index 04177526..64b8ac75 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.6.10
+dokka_it_kotlin_version=1.6.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 58383805..9a4d1ab9 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
@@ -156,7 +156,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
val indexFile = File(this, "index.html")
assertTrue(indexFile.isFile, "Missing index.html")
assertTrue(
- """<title>Basic Project 1.6.10-SNAPSHOT API </title>""" in indexFile.readText(),
+ """<title>Basic Project 1.6.20-SNAPSHOT API </title>""" 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/Multiplatform0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt
index 55f4ce64..64064c93 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
@@ -23,6 +23,7 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions)
}
@Test
+ @Ignore("KLIB is currently not supported, planned for 1.6.21")
fun execute() {
val result = createGradleRunner("dokkaHtml", "-i", "-s").buildRelaxed()
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 85f40cb7..4ed06b9f 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
@@ -4,8 +4,8 @@ internal object TestedVersions {
val BASE =
BuildVersions.permutations(
- gradleVersions = listOf("7.3", "6.9"),
- kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"),
+ gradleVersions = listOf("7.4.2", "6.9"),
+ kotlinVersions = listOf("1.6.20", "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"))
@@ -17,12 +17,12 @@ internal object TestedVersions {
*/
val ANDROID =
BuildVersions.permutations(
- gradleVersions = listOf("7.3", *ifExhaustive("7.0")),
- kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"),
- androidGradlePluginVersions = listOf("7.0.0")
+ gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
+ kotlinVersions = listOf("1.6.20", "1.5.31", "1.4.32"),
+ androidGradlePluginVersions = listOf("7.1.2")
) + BuildVersions.permutations(
gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")),
- kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"),
+ kotlinVersions = listOf("1.6.20", "1.5.31", "1.4.32"),
androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3"))
)
@@ -32,5 +32,6 @@ internal object TestedVersions {
"1.6.0" to "-Preact_version=17.0.2-pre.280-kotlin-1.6.0",
"1.5.31" to "-Preact_version=17.0.2-pre.265-kotlin-1.5.31",
"1.6.10" to "-Preact_version=18.0.0-pre.325-kotlin-1.6.10",
+ "1.6.20" to "-Preact_version=18.0.0-pre.329-kotlin-1.6.20"
)
} \ No newline at end of file