From 1a6bb5cd08e72d2bc396e26f6ec31f88451988d6 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 15 Jun 2021 12:08:33 +0200 Subject: [PATCH] Allow to pass any object for 'jdkVersion'. This object should be accepted by 'JavaVersion.toVersion' method. ^KT-45611 In Progress --- .../kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt index fd359bbaec3..50b401eb18e 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt @@ -40,8 +40,10 @@ interface KotlinJavaToolchain { * * Major JDK version is considered as compile task input. * - * @param jdkHomeLocation path to JDK. + * @param jdkHomeLocation path to the JDK + * * *Note*: project build will fail on providing here JRE instead of JDK! + * * @param jdkVersion provided JDK version */ fun use( @@ -52,12 +54,16 @@ interface KotlinJavaToolchain { /** * Set JDK to use for Kotlin compilation. * - * @see [use] + * @param jdkHomeLocation path to the JDK + * + * **Note**: project build will fail on providing here JRE instead of JDK! + * + * @param jdkVersion any type that is accepted by [JavaVersion.toVersion] */ fun use( jdkHomeLocation: String, - jdkVersion: JavaVersion - ) = use(File(jdkHomeLocation), jdkVersion) + jdkVersion: Any + ) = use(File(jdkHomeLocation), JavaVersion.toVersion(jdkVersion)) } interface JavaToolchainSetter {