Include :native:kotlin-native-utils into kotlin-compiler.jar

This commit is contained in:
Dmitriy Dolovov
2020-03-30 11:17:19 +07:00
parent 28cb9d4e13
commit 31a1f8ff4b
7 changed files with 13 additions and 8 deletions
+6 -1
View File
@@ -247,6 +247,7 @@ extra["compilerModules"] = arrayOf(
":js:js.translator",
":js:js.dce",
":native:frontend.native",
":native:kotlin-native-utils",
":compiler",
":kotlin-build-common",
":core:metadata",
@@ -559,6 +560,10 @@ tasks {
// dependsOn(":js:js.tests:wasmTest")
}
register("nativeCompilerTest") {
dependsOn(":native:kotlin-native-utils:test")
}
register("firCompilerTest") {
dependsOn(":compiler:fir:raw-fir:psi2fir:test")
dependsOn(":compiler:fir:raw-fir:light-tree2fir:test")
@@ -600,6 +605,7 @@ tasks {
dependsOn("jvmCompilerTest")
dependsOn("jsCompilerTest")
dependsOn("wasmCompilerTest")
dependsOn("nativeCompilerTest")
dependsOn("firCompilerTest")
dependsOn("scriptingTest")
@@ -612,7 +618,6 @@ tasks {
register("toolsTest") {
dependsOn(":tools:kotlinp:test")
dependsOn(":native:kotlin-native-utils:test")
dependsOn(":native:kotlin-klib-commonizer:test")
}
-1
View File
@@ -9,7 +9,6 @@ dependencies {
compile(project(":idea:idea-jvm"))
compile(project(":compiler:frontend"))
compile(project(":native:frontend.native"))
compile(project(":native:kotlin-native-utils"))
compileOnly(intellijDep())
Platform[192].orHigher {
@@ -35,8 +35,8 @@ dependencies {
compileOnly(project(":daemon-common"))
compile(kotlinStdlib())
compile(project(":native:kotlin-native-utils"))
compile(project(":kotlin-util-klib"))
compileOnly(project(":native:kotlin-native-utils"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-android-extensions"))
compileOnly(project(":kotlin-build-common"))
@@ -8,7 +8,6 @@ dependencies {
embedded(project(":native:kotlin-klib-commonizer")) { isTransitive = false }
runtime(kotlinStdlib())
runtime(project(":kotlin-compiler-embeddable"))
runtime(project(":native:kotlin-native-utils"))
}
sourceSets {
-1
View File
@@ -26,7 +26,6 @@ dependencies {
mavenCompileScope(project(":kotlin-compiler"))
compile(kotlinStdlib())
compile(project(":native:kotlin-native-utils"))
testCompile(commonDep("junit:junit"))
testCompile(projectTests(":compiler:tests-common"))
+1
View File
@@ -7,6 +7,7 @@ dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compile(project(":native:kotlin-native-utils"))
}
sourceSets {
+5 -3
View File
@@ -6,19 +6,21 @@ plugins {
description = "Kotlin/Native utils"
dependencies {
compile(kotlinStdlib())
compileOnly(kotlinStdlib())
compile(project(":kotlin-util-io"))
testCompile(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntime(project(":kotlin-reflect"))}
testRuntime(project(":kotlin-reflect"))
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
// TODO: this single known external consumer of this artifact is Kotlin/Native backend,
// so publishing could be stopped after migration to monorepo
publish()
standardPublicJars()