From dda25875d4ec871c4c3b29f8f61684951bc0c632 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 5 Sep 2019 19:37:38 +0700
Subject: [PATCH] Gradle, native: Use language settings when link from sources

Take language settings into account when a final binary is
being built from sources.
---
 .../targets/native/tasks/KotlinNativeTasks.kt | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

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 20586991eee..d4f3a60fdef 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
@@ -432,6 +432,29 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
         fn.call()
     }
 
+    //region language settings inputs for the [linkFromSources] mode. 
+    // TODO: Remove in 1.3.70.
+    @get:Optional
+    @get:Input
+    val languageVersion: String?
+        get() = languageSettings?.languageVersion?.takeIf { linkFromSources }
+
+    @get:Optional
+    @get:Input
+    val apiVersion: String?
+        get() = languageSettings?.apiVersion?.takeIf { linkFromSources }
+
+    @get:Optional
+    @get:Input
+    val enabledLanguageFeatures: Set<String>?
+        get() = languageSettings?.enabledLanguageFeatures?.takeIf { linkFromSources }
+
+    @get:Optional
+    @get:Input
+    val experimentalAnnotationsInUse: Set<String>?
+        get() = languageSettings?.experimentalAnnotationsInUse?.takeIf { linkFromSources }
+    // endregion.
+
     // Binary-specific options.
     @get:Optional
     @get:Input
@@ -488,6 +511,21 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
             add("-Xexport-library=${it.absolutePath}")
         }
         addKey("-Xstatic-framework", isStaticFramework)
+
+        // Allow a user to force the old behaviour of a link task.
+        // TODO: Remove in 1.3.70.
+        if (!linkFromSources) {
+            languageSettings?.let {
+                addArgIfNotNull("-language-version", it.languageVersion)
+                addArgIfNotNull("-api-version", it.apiVersion)
+                it.enabledLanguageFeatures.forEach { featureName ->
+                    add("-XXLanguage:+$featureName")
+                }
+                it.experimentalAnnotationsInUse.forEach { annotationName ->
+                    add("-Xuse-experimental=$annotationName")
+                }
+            }
+        }
     }
 
     override fun buildSourceArgs(): List<String> {