From f5393dd740eaf533fe9ff51003b175ef1c1418fe Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Fri, 21 Jul 2023 15:19:17 +0300 Subject: Update Kotlin to 1.9.0 (#3074) * Update Kotlin Gradle Plugin to 1.9.0 * Update Android Gradle Plugin to 4.2.2 * Introduce convention plugin for Gradle runner https://github.com/gradle/gradle/issues/8301 * Fix unit test `common, jvm and macos source sets with kotlin multiplatform` * Update compiler to 1.9.0 * Update integration test * Add empty target for WASM integration test to avoid single target project See https://github.com/Kotlin/dokka/issues/3038 * Remove unused `plugins.shadow` from toml --- .../kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'integration-tests/gradle/src') 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 0b56d6ef..eb39ef4f 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,7 +2,7 @@ package org.jetbrains.dokka.it.gradle internal object TestedVersions { - val LATEST = BuildVersions("7.4.2", "1.8.20") + val LATEST = BuildVersions("7.6.2", "1.9.0") /** * All supported Gradle/Kotlin versions, including [LATEST] @@ -12,10 +12,10 @@ internal object TestedVersions { val ALL_SUPPORTED = BuildVersions.permutations( gradleVersions = listOf("6.9"), - kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.8.20", "1.7.20", "1.6.21", "1.5.31"), ) + BuildVersions.permutations( gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")), - kotlinVersions = listOf(*ifExhaustive("1.7.0", "1.6.0", "1.5.0", "1.4.0")) + kotlinVersions = listOf(*ifExhaustive( "1.8.0", "1.7.0", "1.6.0", "1.5.0")) ) + LATEST /** @@ -46,6 +46,7 @@ internal object TestedVersions { "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", - "1.8.20" to "18.2.0-pre.546" + "1.8.20" to "18.2.0-pre.546", + "1.9.0" to "18.2.0-pre.597", ) } -- cgit