From bbc43cde74a31f580b4ada09ecfd9314d6b682cb Mon Sep 17 00:00:00 2001
From: "konstantin.tskhovrebov" <konstantin.tskhovrebov@jetbrains.com>
Date: Mon, 15 Nov 2021 17:56:04 +0100
Subject: [PATCH] Change FileCollection to List<File> for K/N argument builder.

---
 .../native/tasks/KotlinNativeCompilerArgBuilder.kt | 14 ++++++--------
 .../targets/native/tasks/KotlinNativeTasks.kt      |  3 +--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
index c54d60b6c33..62689c1ae78 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
@@ -77,9 +77,8 @@ internal fun buildKotlinNativeBinaryLinkerArgs(
     target: KonanTarget,
     outputKind: CompilerOutputKind,
     libraries: List<File>,
-    friendModule: FileCollection,
+    friendModules: List<File>,
 
-    languageSettings: LanguageSettings,
     enableEndorsedLibs: Boolean,
     kotlinOptions: KotlinCommonToolOptions,
     compilerPlugins: List<CompilerPluginData>,
@@ -108,14 +107,13 @@ internal fun buildKotlinNativeBinaryLinkerArgs(
     binaryOptions.forEach { (name, value) -> add("-Xbinary=$name=$value") }
     addKey("-Xstatic-framework", isStaticFramework)
 
-    addAll(buildKotlinNativeCommonArgs(languageSettings, enableEndorsedLibs, kotlinOptions, compilerPlugins))
+    addAll(buildKotlinNativeCommonArgs(null, enableEndorsedLibs, kotlinOptions, compilerPlugins))
 
     exportLibraries.forEach { add("-Xexport-library=${it.absolutePath}") }
     includeLibraries.forEach { add("-Xinclude=${it.absolutePath}") }
 
-    val friends = friendModule.files
-    if (friends.isNotEmpty()) {
-        addArg("-friend-modules", friends.joinToString(File.pathSeparator) { it.absolutePath })
+    if (friendModules.isNotEmpty()) {
+        addArg("-friend-modules", friendModules.joinToString(File.pathSeparator) { it.absolutePath })
     }
 }
 
@@ -137,7 +135,7 @@ private fun buildKotlinNativeMainArgs(
 }
 
 internal fun buildKotlinNativeCommonArgs(
-    languageSettings: LanguageSettings,
+    languageSettings: LanguageSettings?, //null for linking
     enableEndorsedLibs: Boolean,
     kotlinOptions: KotlinCommonToolOptions,
     compilerPlugins: List<CompilerPluginData>
@@ -150,7 +148,7 @@ internal fun buildKotlinNativeCommonArgs(
         addArgs("-P", plugin.options.arguments)
     }
 
-    with(languageSettings) {
+    languageSettings?.run {
         addArgIfNotNull("-language-version", languageVersion)
         addArgIfNotNull("-api-version", apiVersion)
         addKey("-progressive", progressiveMode)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index e31cbd800bd..1e1d83a6650 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -635,8 +635,7 @@ constructor(
             konanTarget,
             outputKind,
             libraries.files.filterKlibsPassedToCompiler(),
-            friendModule,
-            languageSettings,
+            friendModule.files.toList(),
             enableEndorsedLibs,
             localKotlinOptions,
             plugins,