From 2d099a29b8c8dde095846cda3938032ef79edc62 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 22 Mar 2018 05:49:29 +0300
Subject: [PATCH] Clean up redundant -Xmulti-platform option from multiplatform
 projects

It was necessary before, but now it's provided automatically.
---
 libraries/kotlin.test/js/build.gradle     | 3 +--
 libraries/kotlin.test/junit/build.gradle  | 2 +-
 libraries/kotlin.test/jvm/build.gradle    | 3 +--
 libraries/kotlin.test/testng/build.gradle | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 08fedbb2447..96c2c7a91b1 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -12,8 +12,7 @@ dependencies {
 }
 
 compileKotlin2Js {
-    // TODO: Why "-Xmulti-platfrom" ?
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
     kotlinOptions {
         moduleKind = "umd"
         outputFile = "${buildDir}/classes/main/kotlin-test.js"
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index 90161db63a8..9e1f566d570 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -29,7 +29,7 @@ dist {
 }
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 736d12fa491..dee52b35e16 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -32,9 +32,8 @@ dist {
 }
 
 compileKotlin {
-    // TODO: Why "-Xmulti-platfrom" ?
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
-                                      "-Xmulti-platform", "-module-name", project.archivesBaseName]
+                                      "-module-name", project.archivesBaseName]
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index da25151adbc..0cf8bb1b780 100644
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -29,7 +29,7 @@ dist {
 }
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
 }
 
 compileTestKotlin {