From 2e3a209d0d7cea1e654f69a432570e94f25f3496 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 23 Feb 2024 12:59:50 +0100 Subject: [PATCH] [Gradle] Fix usages of kotlinOptions in BuildKotlinToolingMetadataTask Replaced them with compiler options DSL. ^KT-63419 In Progress --- .../kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt index b4878a3095e..ae8e2f2015f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.tooling import com.android.build.gradle.BaseExtension import org.gradle.api.DefaultTask import org.gradle.api.Project -import org.gradle.api.Task import org.gradle.api.file.ProjectLayout import org.gradle.api.internal.GeneratedSubclass import org.gradle.api.tasks.* @@ -159,9 +158,11 @@ private fun buildTargetMetadataExtras(target: KotlinTarget): KotlinToolingMetada private fun buildJvmExtrasOrNull(target: KotlinTarget): KotlinToolingMetadata.ProjectTargetMetadata.JvmExtras? { if (target !is KotlinJvmTarget) return null + @Suppress("DEPRECATION") return KotlinToolingMetadata.ProjectTargetMetadata.JvmExtras( withJavaEnabled = target.withJavaEnabled, - jvmTarget = target.compilations.findByName(KotlinCompilation.MAIN_COMPILATION_NAME)?.kotlinOptions?.jvmTarget + jvmTarget = target.compilations.findByName(KotlinCompilation.MAIN_COMPILATION_NAME) + ?.compilerOptions?.options?.jvmTarget?.orNull?.target ) }