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 --- .../org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'runners/gradle-plugin/src/main/kotlin') diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt index e05b2075..b534dcc4 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt @@ -55,8 +55,10 @@ private fun KotlinCompilation.classpathOf(project: Project): FileCollection { val shouldKeepBackwardsCompatibility = (kgpVersion != null && kgpVersion < KotlinGradlePluginVersion(1, 7, 0)) return if (shouldKeepBackwardsCompatibility) { - @Suppress("DEPRECATION_ERROR") - kotlinCompile.classpath // deprecated with error since 1.8.0, left for compatibility with < Kotlin 1.7 + // removed since 1.9.0, left for compatibility with < Kotlin 1.7 + val classpathGetter= kotlinCompile::class.members + .first { it.name == "getClasspath" } + classpathGetter.call(kotlinCompile) as FileCollection } else { kotlinCompile.libraries // introduced in 1.7.0 } -- cgit