diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index ee3da8aab4a..25808b9ae8d 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -1,4 +1,3 @@ - description = "Kotlin Build Common" plugins { @@ -12,7 +11,7 @@ dependencies { compileOnly(project(":compiler:cli-common")) compileOnly(project(":compiler:frontend.java")) compileOnly(project(":js:js.serializer")) - compileOnly(project(":js:js.frontend")) + compileOnly(project(":js:js.config")) compileOnly(project(":kotlin-util-klib-metadata")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) } diff --git a/compiler/daemon/daemon-common-new/build.gradle.kts b/compiler/daemon/daemon-common-new/build.gradle.kts index c700ced8ab2..944588c8cf4 100644 --- a/compiler/daemon/daemon-common-new/build.gradle.kts +++ b/compiler/daemon/daemon-common-new/build.gradle.kts @@ -1,13 +1,3 @@ -/* - * Copyright 2010-2018 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. - */ - -/* - * Copyright 2000-2018 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. - */ - plugins { java kotlin("jvm") @@ -16,16 +6,11 @@ plugins { jvmTarget = "1.6" -val ktorExcludesForDaemon : List> by rootProject.extra +val ktorExcludesForDaemon: List> by rootProject.extra dependencies { - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:util")) - compile(project(":compiler:cli-common")) compileOnly(project(":daemon-common")) compile(kotlinStdlib()) - compileOnly(project(":js:js.frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts index 58c6ca69092..6471dc723c7 100644 --- a/compiler/daemon/daemon-common/build.gradle.kts +++ b/compiler/daemon/daemon-common/build.gradle.kts @@ -4,13 +4,10 @@ plugins { } dependencies { - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:util")) compile(project(":compiler:cli-common")) compile(project(":kotlin-build-common")) compile(kotlinStdlib()) - compileOnly(project(":js:js.frontend")) + compileOnly(project(":js:js.config")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { @@ -22,4 +19,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - diff --git a/js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProvider.kt b/js/js.config/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProvider.kt similarity index 97% rename from js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProvider.kt rename to js/js.config/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProvider.kt index de21b181e83..db8fac66d59 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProvider.kt +++ b/js/js.config/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProvider.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.incremental.js -import org.jetbrains.kotlin.name.FqName import java.io.File // byte arrays are used to simplify passing to different classloaders diff --git a/js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt b/js/js.config/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt similarity index 97% rename from js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt rename to js/js.config/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt index 6d8bb797a8f..cf52d43514a 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt +++ b/js/js.config/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.incremental.js import java.io.File -import java.io.Serializable import java.security.MessageDigest interface IncrementalResultsConsumer { @@ -59,8 +58,6 @@ interface IncrementalNextRoundChecker { fun shouldGoToNextRound(): Boolean } -class JsInlineFunctionHash(val sourceFilePath: String, val fqName: String, val inlineFunctionMd5Hash: Long): Serializable - class FunctionWithSourceInfo(val expression: Any, val line: Int, val column: Int) { val md5: Long get() = "($line:$column)$expression".toByteArray().md5() diff --git a/js/js.config/src/org/jetbrains/kotlin/incremental/js/JsInlineFunctionHash.kt b/js/js.config/src/org/jetbrains/kotlin/incremental/js/JsInlineFunctionHash.kt new file mode 100644 index 00000000000..11cacb1979e --- /dev/null +++ b/js/js.config/src/org/jetbrains/kotlin/incremental/js/JsInlineFunctionHash.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.incremental.js + +import java.io.Serializable + +class JsInlineFunctionHash(val sourceFilePath: String, val fqName: String, val inlineFunctionMd5Hash: Long) : Serializable diff --git a/js/js.frontend/src/org/jetbrains/kotlin/incremental/js/TranslationResultValue.kt b/js/js.config/src/org/jetbrains/kotlin/incremental/js/TranslationResultValue.kt similarity index 100% rename from js/js.frontend/src/org/jetbrains/kotlin/incremental/js/TranslationResultValue.kt rename to js/js.config/src/org/jetbrains/kotlin/incremental/js/TranslationResultValue.kt