Move package org.jetbrains.kotlin.incremental.js to 'js.config'

This allows to replace dependency on 'js.frontend' with 'js.config', in
'kotlin-build-common' and 'daemon-common'. Also simplify some other
dependencies.
This commit is contained in:
Alexander Udalov
2020-03-15 13:02:31 +01:00
committed by Alexander Udalov
parent 4dcd0d1cb6
commit fe5104b865
7 changed files with 13 additions and 27 deletions
+1 -2
View File
@@ -1,4 +1,3 @@
description = "Kotlin Build Common" description = "Kotlin Build Common"
plugins { plugins {
@@ -12,7 +11,7 @@ dependencies {
compileOnly(project(":compiler:cli-common")) compileOnly(project(":compiler:cli-common"))
compileOnly(project(":compiler:frontend.java")) compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":js:js.serializer")) compileOnly(project(":js:js.serializer"))
compileOnly(project(":js:js.frontend")) compileOnly(project(":js:js.config"))
compileOnly(project(":kotlin-util-klib-metadata")) compileOnly(project(":kotlin-util-klib-metadata"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) }
@@ -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 { plugins {
java java
kotlin("jvm") kotlin("jvm")
@@ -16,16 +6,11 @@ plugins {
jvmTarget = "1.6" jvmTarget = "1.6"
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
dependencies { dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compileOnly(project(":daemon-common")) compileOnly(project(":daemon-common"))
compile(kotlinStdlib()) compile(kotlinStdlib())
compileOnly(project(":js:js.frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
@@ -4,13 +4,10 @@ plugins {
} }
dependencies { dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common")) compile(project(":compiler:cli-common"))
compile(project(":kotlin-build-common")) compile(project(":kotlin-build-common"))
compile(kotlinStdlib()) compile(kotlinStdlib())
compileOnly(project(":js:js.frontend")) compileOnly(project(":js:js.config"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
@@ -22,4 +19,3 @@ sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" {} "test" {}
} }
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.incremental.js package org.jetbrains.kotlin.incremental.js
import org.jetbrains.kotlin.name.FqName
import java.io.File import java.io.File
// byte arrays are used to simplify passing to different classloaders // byte arrays are used to simplify passing to different classloaders
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.incremental.js package org.jetbrains.kotlin.incremental.js
import java.io.File import java.io.File
import java.io.Serializable
import java.security.MessageDigest import java.security.MessageDigest
interface IncrementalResultsConsumer { interface IncrementalResultsConsumer {
@@ -59,8 +58,6 @@ interface IncrementalNextRoundChecker {
fun shouldGoToNextRound(): Boolean 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) { class FunctionWithSourceInfo(val expression: Any, val line: Int, val column: Int) {
val md5: Long val md5: Long
get() = "($line:$column)$expression".toByteArray().md5() get() = "($line:$column)$expression".toByteArray().md5()
@@ -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