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

This allows to get rid of dependency cli.common -> js.frontend.
This commit is contained in:
Alexander Udalov
2020-03-14 23:32:56 +01:00
committed by Alexander Udalov
parent 15d2a06132
commit 143aef938b
8 changed files with 19 additions and 5 deletions
+1 -2
View File
@@ -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" {}
}
@@ -1,34 +0,0 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("DEPRECATION_ERROR")
package org.jetbrains.kotlin.js.resolve
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.resolve.TargetPlatform
@Deprecated(
message = "This class is deprecated and will be removed soon, use API from 'org.jetbrains.kotlin.platform.*' packages instead",
replaceWith = ReplaceWith("JsPlatforms.defaultJsPlatform", "org.jetbrains.kotlin.platform.js.JsPlatforms"),
level = DeprecationLevel.ERROR
)
interface JsPlatform : TargetPlatform {
companion object {
@JvmField
val INSTANCE: JsPlatform = JsPlatforms.CompatJsPlatform
}
}
@@ -1,38 +0,0 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
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
get() = "JavaScript "
}
@Suppress("DEPRECATION_ERROR")
object JsPlatforms {
private object DefaultSimpleJsPlatform : JsPlatform()
@Deprecated(
message = "Should be accessed only by compatibility layer, other clients should use 'defaultJsPlatform'",
level = DeprecationLevel.ERROR
)
object CompatJsPlatform : TargetPlatform(setOf(DefaultSimpleJsPlatform)),
// Needed for backward compatibility, because old code uses INSTANCEOF checks instead of calling extensions
org.jetbrains.kotlin.js.resolve.JsPlatform {
override val platformName: String
get() = "JS"
}
val defaultJsPlatform: TargetPlatform
get() = CompatJsPlatform
val allJsPlatforms: List<TargetPlatform> = listOf(defaultJsPlatform)
}
fun TargetPlatform?.isJs(): Boolean = this?.singleOrNull() is JsPlatform