From 143aef938b2b45e20dfb63355bf916926e1fa723 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sat, 14 Mar 2020 23:32:56 +0100
Subject: [PATCH] Extract module 'js.config' out of 'js.frontend'

This allows to get rid of dependency cli.common -> js.frontend.
---
 build.gradle.kts                                    |  1 +
 compiler/cli/cli-common/build.gradle.kts            |  2 +-
 js/js.config/build.gradle.kts                       | 13 +++++++++++++
 .../org/jetbrains/kotlin/js/resolve/JsPlatform.kt   |  0
 .../org/jetbrains/kotlin/platform/js/JsPlatform.kt  |  3 +--
 js/js.frontend/build.gradle.kts                     |  3 +--
 prepare/idea-plugin/build.gradle.kts                |  1 +
 settings.gradle                                     |  1 +
 8 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 js/js.config/build.gradle.kts
 rename js/{js.frontend => js.config}/src/org/jetbrains/kotlin/js/resolve/JsPlatform.kt (100%)
 rename js/{js.frontend => js.config}/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt (95%)

diff --git a/build.gradle.kts b/build.gradle.kts
index b606004f941..eb183a58272 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -241,6 +241,7 @@ extra["compilerModules"] = arrayOf(
     ":js:js.ast",
     ":js:js.serializer",
     ":js:js.parser",
+    ":js:js.config",
     ":js:js.frontend",
     ":js:js.translator",
     ":js:js.dce",
diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts
index b6a8e49f9cf..23a00268c2c 100644
--- a/compiler/cli/cli-common/build.gradle.kts
+++ b/compiler/cli/cli-common/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     compile(project(":core:util.runtime"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:config.jvm"))
-    compile(project(":js:js.frontend"))
+    compile(project(":js:js.config"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/js/js.config/build.gradle.kts b/js/js.config/build.gradle.kts
new file mode 100644
index 00000000000..ef2b712c5f3
--- /dev/null
+++ b/js/js.config/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":compiler:frontend.common"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatform.kt b/js/js.config/src/org/jetbrains/kotlin/js/resolve/JsPlatform.kt
similarity index 100%
rename from js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatform.kt
rename to js/js.config/src/org/jetbrains/kotlin/js/resolve/JsPlatform.kt
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt b/js/js.config/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt
similarity index 95%
rename from js/js.frontend/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt
rename to js/js.config/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt
index c73e9eca184..58d722b7fb6 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt
+++ b/js/js.config/src/org/jetbrains/kotlin/platform/js/JsPlatform.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.platform.js
 
 import org.jetbrains.kotlin.platform.SimplePlatform
 import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.toTargetPlatform
 
 abstract class JsPlatform : SimplePlatform("JS") {
     override val oldFashionedDescription: String
@@ -35,4 +34,4 @@ object JsPlatforms {
     val allJsPlatforms: List<TargetPlatform> = listOf(defaultJsPlatform)
 }
 
-fun TargetPlatform?.isJs(): Boolean = this?.singleOrNull() is JsPlatform
\ No newline at end of file
+fun TargetPlatform?.isJs(): Boolean = this?.singleOrNull() is JsPlatform
diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts
index 5aea9cd0e43..acfea6ac414 100644
--- a/js/js.frontend/build.gradle.kts
+++ b/js/js.frontend/build.gradle.kts
@@ -1,4 +1,3 @@
-
 plugins {
     kotlin("jvm")
     id("jps-compatible")
@@ -10,6 +9,7 @@ dependencies {
     compile(project(":js:js.ast"))
     compile(project(":js:js.parser"))
     compile(project(":js:js.serializer"))
+    compile(project(":js:js.config"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
 }
@@ -18,4 +18,3 @@ sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 2d2a1ae519c..d8cad418cbe 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -62,6 +62,7 @@ val projectsToShadow by extra(listOf(
         ":js:js.ast",
         ":js:js.frontend",
         ":js:js.parser",
+        ":js:js.config",
         ":js:js.serializer",
         ":js:js.translator",
         ":native:kotlin-native-utils",
diff --git a/settings.gradle b/settings.gradle
index 3162b27e98c..0130297ca7e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -126,6 +126,7 @@ include ":kotlin-build-common",
         ":js:js.ast",
         ":js:js.serializer",
         ":js:js.parser",
+        ":js:js.config",
         ":js:js.engines",
         ":js:js.frontend",
         ":js:js.translator",