From 5dcc853df3448ec472ceed3eab37ab91b82cf2d8 Mon Sep 17 00:00:00 2001
From: Dmitrii Krasnov <dmitrii.krasnov@jetbrains.com>
Date: Thu, 21 Dec 2023 16:22:07 +0100
Subject: [PATCH] [Gradle] Fixed warnings in KotlinNativeTasks.kt

^KT-56904
---
 .../compilerRunner/GradleKotlinCompilerRunner.kt  |  3 ++-
 .../kotlin/compilerRunner/reportUtils.kt          | 15 ---------------
 .../targets/native/tasks/KotlinNativeTasks.kt     |  7 +++++--
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
index 84020a9aebf..50f120ab438 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.daemon.common.configureDaemonJVMOptions
 import org.jetbrains.kotlin.daemon.common.filterExtractProps
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull
 import org.jetbrains.kotlin.gradle.internal.ClassLoadersCachingBuildService
 import org.jetbrains.kotlin.gradle.logging.kotlinDebug
@@ -235,7 +236,7 @@ internal open class GradleCompilerRunner(
             errorsFiles = errorsFiles,
             kotlinPluginVersion = getKotlinPluginVersion(loggerProvider),
             //no need to log warnings in MessageCollector hear it will be logged by compiler
-            kotlinLanguageVersion = parseLanguageVersion(compilerArgs.languageVersion, compilerArgs.useK2),
+            kotlinLanguageVersion = compilerArgs.languageVersion?.let { v -> KotlinVersion.fromVersion(v) } ?: KotlinVersion.DEFAULT,
             compilerArgumentsLogLevel = environment.compilerArgumentsLogLevel,
         )
         TaskLoggers.put(pathProvider, loggerProvider)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt
index 7fc5d88a965..1fa3461dee8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt
@@ -249,21 +249,6 @@ internal fun exitCodeFromProcessExitCode(log: KotlinLogger, code: Int): ExitCode
     return if (code == 0) ExitCode.OK else ExitCode.COMPILATION_ERROR
 }
 
-//Copy of CommonCompilerArguments.parseOrConfigureLanguageVersion to avoid direct dependency
-internal fun parseLanguageVersion(languageVersion: String?, useK2: Boolean): KotlinVersion {
-    val explicitVersion = languageVersion?.let { KotlinVersion.fromVersion(languageVersion) } ?: KotlinVersion.DEFAULT
-    return if (useK2 && (explicitVersion < KotlinVersion.KOTLIN_2_0)) KotlinVersion.KOTLIN_2_0 else explicitVersion
-}
-
-internal fun parseLanguageVersion(args: List<String>): KotlinVersion {
-    val languageVersionIndex = args.indexOf("-language-version")
-    val languageVersion = if (languageVersionIndex >= 0) {
-        args[languageVersionIndex + 1]
-    } else null
-    val useK2 = args.indexOf("-Xuse-k2") >= 0
-    return parseLanguageVersion(languageVersion, useK2)
-}
-
 internal fun UsesBuildMetricsService.addBuildMetricsForTaskAction(
     metricsReporter: BuildMetricsReporter<GradleBuildTime, GradleBuildPerformanceMetric>,
     languageVersion: KotlinVersion?,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index a5fd71339ac..7d5108b8f3c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -515,7 +515,7 @@ internal constructor(
         val buildMetrics = metrics.get()
         addBuildMetricsForTaskAction(
             metricsReporter = buildMetrics,
-            languageVersion = parseLanguageVersion(compilerOptions.languageVersion.orNull?.version, compilerOptions.useK2.get())
+            languageVersion = resolveLanguageVersion()
         ) {
             val arguments = createCompilerArguments()
             val buildArguments = buildMetrics.measure(GradleBuildTime.OUT_OF_WORKER_TASK_ACTION) {
@@ -535,6 +535,9 @@ internal constructor(
 
     }
 
+    private fun resolveLanguageVersion() =
+        compilerOptions.languageVersion.orNull?.version?.let { v -> KotlinVersion.fromVersion(v) }
+
     private fun collectCommonCompilerStats() {
         buildFusService.orNull?.reportFusMetrics {
             it.report(BooleanMetrics.KOTLIN_PROGRESSIVE_MODE, compilerOptions.progressiveMode.get())
@@ -554,7 +557,7 @@ internal class ExternalDependenciesBuilder(
     intermediateLibraryName: String?,
 ) {
     constructor(project: Project, compilation: KotlinNativeCompilation) : this(
-        project, compilation, compilation.compileKotlinTask.moduleName
+        project, compilation, compilation.compileTaskProvider.get().compilerOptions.moduleName.get()
     )
 
     private val compileDependencyConfiguration: Configuration