Extract module 'js.config' out of 'js.frontend'

This allows to get rid of dependency cli.common -> js.frontend.

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",

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) }

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" {}
+}

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
+fun TargetPlatform?.isJs(): Boolean = this?.singleOrNull() is JsPlatform

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" {}
 }
-

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",

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",