From 149b197b2491be178f9e46b09559d7e9e6f5867a Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Fri, 22 Dec 2017 16:09:50 +0300
Subject: [PATCH] Fix unconditional warning in JS compilation with sourceMap
 disabled.

---
 .../kotlin/cli/common/arguments/DefaultValues.kt          | 2 +-
 .../org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt    | 4 ++--
 .../jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
index 3e7707a3e34..99886a05864 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
@@ -51,7 +51,7 @@ open class DefaultValues(val defaultValue: String, val possibleValues: List<Stri
     )
 
     object JsSourceMapContentModes : DefaultValues(
-            "\"${K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_INLINING}\"",
+            "null",
             listOf(
                     K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_NEVER,
                     K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_ALWAYS,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
index 017376af171..7a937606991 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
@@ -51,9 +51,9 @@ interface KotlinJsOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
     /**
      * Embed source files into source map
      * Possible values: "never", "always", "inlining"
-     * Default value: "inlining"
+     * Default value: null
      */
-     var sourceMapEmbedSources: kotlin.String
+     var sourceMapEmbedSources: kotlin.String?
 
     /**
      * Prefix for paths in a source map
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
index 392416b9880..0330b1b3cb7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
@@ -64,9 +64,9 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
         get() = sourceMapField ?: false
         set(value) { sourceMapField = value }
 
-    private var sourceMapEmbedSourcesField: kotlin.String? = null
-    override var sourceMapEmbedSources: kotlin.String
-        get() = sourceMapEmbedSourcesField ?: "inlining"
+    private var sourceMapEmbedSourcesField: kotlin.String?? = null
+    override var sourceMapEmbedSources: kotlin.String?
+        get() = sourceMapEmbedSourcesField ?: null
         set(value) { sourceMapEmbedSourcesField = value }
 
     private var sourceMapPrefixField: kotlin.String?? = null
@@ -117,7 +117,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fil
     noStdlib = true
     outputFile = null
     sourceMap = false
-    sourceMapEmbedSources = "inlining"
+    sourceMapEmbedSources = null
     sourceMapPrefix = null
     target = "v5"
     typedArrays = true