azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix usages of kotlinOptions in BuildKotlinToolingMetadataTask

Browse Source 
Replaced them with compiler options DSL.

^KT-63419 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-23 12:59:50 +01:00
committed by Space Team
parent 66a39952ee
commit 2e3a209d0d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt
+3 -2
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.tooling
import com.android.build.gradle.BaseExtension import com.android.build.gradle.BaseExtension
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.file.ProjectLayout import org.gradle.api.file.ProjectLayout
import org.gradle.api.internal.GeneratedSubclass import org.gradle.api.internal.GeneratedSubclass
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
@@ -159,9 +158,11 @@ private fun buildTargetMetadataExtras(target: KotlinTarget): KotlinToolingMetada
private fun buildJvmExtrasOrNull(target: KotlinTarget): KotlinToolingMetadata.ProjectTargetMetadata.JvmExtras? { private fun buildJvmExtrasOrNull(target: KotlinTarget): KotlinToolingMetadata.ProjectTargetMetadata.JvmExtras? {
if (target !is KotlinJvmTarget) return null if (target !is KotlinJvmTarget) return null
@Suppress("DEPRECATION")
return KotlinToolingMetadata.ProjectTargetMetadata.JvmExtras( return KotlinToolingMetadata.ProjectTargetMetadata.JvmExtras(
withJavaEnabled = target.withJavaEnabled, 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
) )
} }