Include :native:kotlin-native-utils into kotlin-compiler.jar
This commit is contained in:
+6
-1
@@ -247,6 +247,7 @@ extra["compilerModules"] = arrayOf(
|
|||||||
":js:js.translator",
|
":js:js.translator",
|
||||||
":js:js.dce",
|
":js:js.dce",
|
||||||
":native:frontend.native",
|
":native:frontend.native",
|
||||||
|
":native:kotlin-native-utils",
|
||||||
":compiler",
|
":compiler",
|
||||||
":kotlin-build-common",
|
":kotlin-build-common",
|
||||||
":core:metadata",
|
":core:metadata",
|
||||||
@@ -559,6 +560,10 @@ tasks {
|
|||||||
// dependsOn(":js:js.tests:wasmTest")
|
// dependsOn(":js:js.tests:wasmTest")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
register("nativeCompilerTest") {
|
||||||
|
dependsOn(":native:kotlin-native-utils:test")
|
||||||
|
}
|
||||||
|
|
||||||
register("firCompilerTest") {
|
register("firCompilerTest") {
|
||||||
dependsOn(":compiler:fir:raw-fir:psi2fir:test")
|
dependsOn(":compiler:fir:raw-fir:psi2fir:test")
|
||||||
dependsOn(":compiler:fir:raw-fir:light-tree2fir:test")
|
dependsOn(":compiler:fir:raw-fir:light-tree2fir:test")
|
||||||
@@ -600,6 +605,7 @@ tasks {
|
|||||||
dependsOn("jvmCompilerTest")
|
dependsOn("jvmCompilerTest")
|
||||||
dependsOn("jsCompilerTest")
|
dependsOn("jsCompilerTest")
|
||||||
dependsOn("wasmCompilerTest")
|
dependsOn("wasmCompilerTest")
|
||||||
|
dependsOn("nativeCompilerTest")
|
||||||
dependsOn("firCompilerTest")
|
dependsOn("firCompilerTest")
|
||||||
|
|
||||||
dependsOn("scriptingTest")
|
dependsOn("scriptingTest")
|
||||||
@@ -612,7 +618,6 @@ tasks {
|
|||||||
|
|
||||||
register("toolsTest") {
|
register("toolsTest") {
|
||||||
dependsOn(":tools:kotlinp:test")
|
dependsOn(":tools:kotlinp:test")
|
||||||
dependsOn(":native:kotlin-native-utils:test")
|
|
||||||
dependsOn(":native:kotlin-klib-commonizer:test")
|
dependsOn(":native:kotlin-klib-commonizer:test")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ dependencies {
|
|||||||
compile(project(":idea:idea-jvm"))
|
compile(project(":idea:idea-jvm"))
|
||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":native:frontend.native"))
|
compile(project(":native:frontend.native"))
|
||||||
compile(project(":native:kotlin-native-utils"))
|
|
||||||
|
|
||||||
compileOnly(intellijDep())
|
compileOnly(intellijDep())
|
||||||
Platform[192].orHigher {
|
Platform[192].orHigher {
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ dependencies {
|
|||||||
compileOnly(project(":daemon-common"))
|
compileOnly(project(":daemon-common"))
|
||||||
|
|
||||||
compile(kotlinStdlib())
|
compile(kotlinStdlib())
|
||||||
compile(project(":native:kotlin-native-utils"))
|
|
||||||
compile(project(":kotlin-util-klib"))
|
compile(project(":kotlin-util-klib"))
|
||||||
|
compileOnly(project(":native:kotlin-native-utils"))
|
||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
compileOnly(project(":kotlin-android-extensions"))
|
compileOnly(project(":kotlin-android-extensions"))
|
||||||
compileOnly(project(":kotlin-build-common"))
|
compileOnly(project(":kotlin-build-common"))
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ dependencies {
|
|||||||
embedded(project(":native:kotlin-klib-commonizer")) { isTransitive = false }
|
embedded(project(":native:kotlin-klib-commonizer")) { isTransitive = false }
|
||||||
runtime(kotlinStdlib())
|
runtime(kotlinStdlib())
|
||||||
runtime(project(":kotlin-compiler-embeddable"))
|
runtime(project(":kotlin-compiler-embeddable"))
|
||||||
runtime(project(":native:kotlin-native-utils"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ dependencies {
|
|||||||
mavenCompileScope(project(":kotlin-compiler"))
|
mavenCompileScope(project(":kotlin-compiler"))
|
||||||
|
|
||||||
compile(kotlinStdlib())
|
compile(kotlinStdlib())
|
||||||
compile(project(":native:kotlin-native-utils"))
|
|
||||||
|
|
||||||
testCompile(commonDep("junit:junit"))
|
testCompile(commonDep("junit:junit"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testCompile(projectTests(":compiler:tests-common"))
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ dependencies {
|
|||||||
compileOnly(project(":compiler:frontend"))
|
compileOnly(project(":compiler:frontend"))
|
||||||
compileOnly(project(":compiler:frontend.java"))
|
compileOnly(project(":compiler:frontend.java"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
compile(project(":native:kotlin-native-utils"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,19 +6,21 @@ plugins {
|
|||||||
description = "Kotlin/Native utils"
|
description = "Kotlin/Native utils"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
compileOnly(kotlinStdlib())
|
||||||
compile(project(":kotlin-util-io"))
|
compile(project(":kotlin-util-io"))
|
||||||
|
|
||||||
testCompile(commonDep("junit:junit"))
|
testCompile(commonDep("junit:junit"))
|
||||||
testCompileOnly(project(":kotlin-reflect-api"))
|
testCompileOnly(project(":kotlin-reflect-api"))
|
||||||
testRuntime(project(":kotlin-reflect"))}
|
testRuntime(project(":kotlin-reflect"))
|
||||||
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
"main" { projectDefault() }
|
"main" { projectDefault() }
|
||||||
"test" { 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()
|
publish()
|
||||||
|
|
||||||
standardPublicJars()
|
standardPublicJars()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user