[K/N][build] Make kotlin-native shared be included subproject
This commit is contained in:
committed by
Space Team
parent
395e3e0f81
commit
8938d5cc79
@@ -59,6 +59,8 @@ dependencies {
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
|
||||
implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
||||
|
||||
api(project(":kotlin-native-shared"))
|
||||
}
|
||||
|
||||
java {
|
||||
@@ -91,8 +93,6 @@ kotlin {
|
||||
sourceSets {
|
||||
main {
|
||||
kotlin.srcDir("src/main/kotlin")
|
||||
kotlin.srcDir("../../kotlin-native/shared/src/library/kotlin")
|
||||
kotlin.srcDir("../../kotlin-native/shared/src/main/kotlin")
|
||||
kotlin.srcDir("../../kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,3 +12,5 @@ org.gradle.java.installations.fromEnv=\
|
||||
JDK_15_0,JDK_15,\
|
||||
JDK_16_0,\
|
||||
JDK_17_0
|
||||
|
||||
kotlin.native.build.composite-bootstrap=true
|
||||
@@ -26,4 +26,18 @@ buildscript {
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
include(":kotlin-native-shared")
|
||||
project(":kotlin-native-shared").projectDir = File("$rootDir/../shared")
|
||||
|
||||
// This code could potentially remove the need of bootstrapping code that use util-klib and util-io
|
||||
// by building them, but it's not possible right now, because they use buildSrc plugins (like JPS) and methods (like commonDependency).
|
||||
// This could be fixed by replacing the buildSrc with the composite build like build-tools, and splitting it to several parts.
|
||||
//include(":native:kotlin-native-utils")
|
||||
//include(":kotlin-util-klib")
|
||||
//include(":kotlin-util-io")
|
||||
|
||||
//project(":native:kotlin-native-utils").projectDir = File("$rootDir/../../native/kotlin-native-utils")
|
||||
//project(":kotlin-util-klib").projectDir = File("$rootDir/../../compiler/util-klib")
|
||||
//project(":kotlin-util-io").projectDir = File("$rootDir/../../compiler/util-io")
|
||||
|
||||
Reference in New Issue
Block a user