From 0768e7404bae8ab024d1cfd5254ed328a8d73de1 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 14 Nov 2017 12:54:30 +0300
Subject: [PATCH] Stop overwriting values with defaults in compiler arguments

'verbose' option was always lost.
---
 .../org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt | 2 +-
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
index fae753980f7..187286dd552 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
@@ -45,8 +45,8 @@ internal open class KotlinCompileCommon : AbstractKotlinCompile<K2MetadataCompil
             findKotlinMetadataCompilerClasspath(project)
 
     override fun setupCompilerArgs(args: K2MetadataCompilerArguments, defaultsOnly: Boolean) {
-        super.setupCompilerArgs(args, defaultsOnly)
         args.apply { fillDefaultValues() }
+        super.setupCompilerArgs(args, defaultsOnly)
 
         if (defaultsOnly) return
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 60360893574..0b0e8586b81 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -281,8 +281,8 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
     }
 
     override fun setupCompilerArgs(args: K2JVMCompilerArguments, defaultsOnly: Boolean) {
-        super.setupCompilerArgs(args, defaultsOnly)
         args.apply { fillDefaultValues() }
+        super.setupCompilerArgs(args, defaultsOnly)
 
         args.addCompilerBuiltIns = true
 
@@ -425,8 +425,9 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArguments>(),
             K2JSCompilerArguments()
 
     override fun setupCompilerArgs(args: K2JSCompilerArguments, defaultsOnly: Boolean) {
-        super.setupCompilerArgs(args, defaultsOnly)
         args.apply { fillDefaultValues() }
+        super.setupCompilerArgs(args, defaultsOnly)
+
         args.outputFile = outputFile
 
         if (defaultsOnly) return