Build: implement useBootstrapStdlib flag
Excludes stdlib projects from build and uses bootstrap stdlib artifacts #KT-29205
This commit is contained in:
@@ -215,3 +215,9 @@ ext.configurePublishing = { Project project ->
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
allprojects { project ->
|
||||
dependencies.ext.kotlinStdlib = { suffix ->
|
||||
DependenciesKt.kotlinStdlib(project, suffix)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -14,7 +14,7 @@ dependencies {
|
||||
|
||||
compile project(':kotlin-test::kotlin-test-junit')
|
||||
|
||||
compileOnly project(":kotlin-stdlib")
|
||||
compileOnly kotlinStdlib()
|
||||
compileOnly project(':compiler')
|
||||
compileOnly project(':compiler:plugin-api')
|
||||
compileOnly project(':compiler:cli-common')
|
||||
|
||||
@@ -8,7 +8,7 @@ plugins {
|
||||
val compilerClasspath by configurations.creating
|
||||
|
||||
dependencies {
|
||||
testCompile(project(":kotlin-stdlib"))
|
||||
testCompile(kotlinStdlib())
|
||||
testCompile(project(":kotlin-script-runtime"))
|
||||
testCompile(project(":kotlin-script-util"))
|
||||
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
|
||||
@@ -18,7 +18,7 @@ dependencies {
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
compilerClasspath(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
||||
compilerClasspath(project(":kotlin-reflect"))
|
||||
compilerClasspath(project(":kotlin-stdlib"))
|
||||
compilerClasspath(kotlinStdlib())
|
||||
compilerClasspath(project(":kotlin-script-runtime"))
|
||||
compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
|
||||
|
||||
@@ -6,7 +6,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
compile(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
||||
compile(project(":kotlin-script-util"))
|
||||
|
||||
@@ -6,7 +6,7 @@ plugins {
|
||||
dependencies {
|
||||
compile(project(":examples:scripting-jvm-maven-deps"))
|
||||
compile(project(":kotlin-scripting-jvm-host"))
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compileOnly(project(":compiler:util"))
|
||||
runtime(project(":kotlin-reflect"))
|
||||
|
||||
@@ -8,7 +8,7 @@ configurePublishing(project)
|
||||
|
||||
|
||||
dependencies {
|
||||
compile project(':kotlin-stdlib-common')
|
||||
compile kotlinStdlib("common")
|
||||
testCompile project(":kotlin-test:kotlin-test-common")
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ configurePublishing(project)
|
||||
|
||||
|
||||
dependencies {
|
||||
compile project(':kotlin-stdlib-common')
|
||||
compile kotlinStdlib("common")
|
||||
testCompile project(":kotlin-test:kotlin-test-annotations-common")
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ configurePublishing(project)
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
compile project(':kotlin-stdlib-js')
|
||||
compile kotlinStdlib("js")
|
||||
}
|
||||
|
||||
compileKotlin2Js {
|
||||
|
||||
@@ -17,7 +17,7 @@ sourceSets {
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||
compile project(':kotlin-stdlib')
|
||||
compile kotlinStdlib()
|
||||
testCompile project(":kotlin-test:kotlin-test-junit")
|
||||
testCompile('junit:junit:4.12')
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compileOnly(project(":core:metadata"))
|
||||
compileOnly(protobufLite())
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ configurations.getByName("compileOnly").extendsFrom(shadows)
|
||||
configurations.getByName("testCompile").extendsFrom(shadows)
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
shadows(project(":kotlinx-metadata"))
|
||||
shadows(project(":core:metadata"))
|
||||
shadows(project(":core:metadata.jvm"))
|
||||
|
||||
@@ -14,7 +14,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':kotlin-stdlib')
|
||||
compile kotlinStdlib()
|
||||
compileOnly project(':core:descriptors')
|
||||
compileOnly project(':core:descriptors.jvm')
|
||||
compileOnly project(':core:deserialization')
|
||||
|
||||
@@ -47,9 +47,9 @@ configurations.getByName("compileOnly").extendsFrom(shadows)
|
||||
val mainJar by configurations.creating
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
|
||||
proguardDeps(project(":kotlin-stdlib"))
|
||||
proguardDeps(kotlinStdlib())
|
||||
proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
|
||||
proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ plugins {
|
||||
jvmTarget = "1.6"
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||
runtime(project(":kotlin-reflect"))
|
||||
|
||||
@@ -8,7 +8,7 @@ jvmTarget = "1.6"
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-scripting-common"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ val packedJars by configurations.creating
|
||||
dependencies {
|
||||
packedJars(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
|
||||
runtime(project(":kotlin-script-runtime"))
|
||||
runtime(project(":kotlin-stdlib"))
|
||||
runtime(kotlinStdlib())
|
||||
runtime(project(":kotlin-scripting-common"))
|
||||
runtime(project(":kotlin-scripting-jvm"))
|
||||
runtime(project(":kotlin-script-util"))
|
||||
|
||||
@@ -8,7 +8,7 @@ jvmTarget = "1.6"
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-scripting-common"))
|
||||
compile(project(":kotlin-scripting-jvm"))
|
||||
compile(project(":kotlin-script-util"))
|
||||
|
||||
@@ -8,7 +8,7 @@ jvmTarget = "1.6"
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-scripting-common"))
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ project.sourceSets.main.antlr.srcDirs = ["src/main/antlr4"]
|
||||
dependencies {
|
||||
antlr "org.antlr:antlr4:$antlr4_version"
|
||||
implementation "org.antlr:antlr4-runtime:$antlr4_version"
|
||||
implementation project(':kotlin-stdlib')
|
||||
implementation kotlinStdlib()
|
||||
implementation "org.jsoup:jsoup:1.8.2"
|
||||
|
||||
testImplementation "junit:junit:4.12"
|
||||
|
||||
@@ -12,7 +12,7 @@ dependencies {
|
||||
compile project(':kotlin-gradle-plugin-api')
|
||||
compile project(':kotlin-gradle-plugin-model')
|
||||
|
||||
compile project(':kotlin-stdlib')
|
||||
compile kotlinStdlib()
|
||||
compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')
|
||||
compileOnly project(':kotlin-allopen-compiler-plugin')
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ plugins {
|
||||
val packedJars by configurations.creating
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
|
||||
runtime(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ standardPublicJars()
|
||||
publish()
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-native:kotlin-native-utils"))
|
||||
|
||||
compileOnly(gradleApi())
|
||||
|
||||
@@ -29,7 +29,7 @@ dependencies {
|
||||
testRuntime(projectRuntimeJar(":kotlin-gradle-plugin-test-utils-embeddable"))
|
||||
|
||||
testCompile(project(path = ":examples:annotation-processor-example"))
|
||||
testCompile(project(":kotlin-stdlib-jdk8"))
|
||||
testCompile(kotlinStdlib("jdk8"))
|
||||
testCompile(project(":kotlin-reflect"))
|
||||
testCompile(project(":kotlin-android-extensions"))
|
||||
testCompile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
|
||||
@@ -10,7 +10,7 @@ standardPublicJars()
|
||||
publish()
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
||||
@@ -35,7 +35,7 @@ dependencies {
|
||||
compileOnly(project(":compiler:incremental-compilation-impl"))
|
||||
compileOnly(project(":compiler:daemon-common"))
|
||||
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-native:kotlin-native-utils"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compileOnly(project(":kotlin-android-extensions"))
|
||||
|
||||
@@ -46,7 +46,7 @@ dependencies {
|
||||
proguardLibraryJars(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar"),
|
||||
firstFromJavaHomeThatExists("jre/lib/jsse.jar", "../Classes/jsse.jar"),
|
||||
toolsJar()))
|
||||
proguardLibraryJars(project(":kotlin-stdlib"))
|
||||
proguardLibraryJars(kotlinStdlib())
|
||||
proguardLibraryJars(project(":kotlin-reflect"))
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ dependencies {
|
||||
compile project(':kotlin-gradle-plugin-api')
|
||||
compile project(':kotlin-gradle-plugin-model')
|
||||
|
||||
compile project(':kotlin-stdlib')
|
||||
compile kotlinStdlib()
|
||||
compileOnly project(':compiler')
|
||||
compileOnly project(':kotlin-noarg-compiler-plugin')
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ dependencies {
|
||||
compile project(':kotlin-gradle-plugin-api')
|
||||
compile project(':kotlin-gradle-plugin-model')
|
||||
|
||||
compile project(':kotlin-stdlib')
|
||||
compile kotlinStdlib()
|
||||
compileOnly project(':compiler')
|
||||
compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
compile(project(":kotlin-scripting-jvm"))
|
||||
compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
|
||||
@@ -13,7 +13,7 @@ dependencies {
|
||||
compileOnly project(':kotlin-gradle-plugin')
|
||||
compileOnly project(':kotlin-gradle-plugin-api')
|
||||
|
||||
compileOnly project(':kotlin-stdlib')
|
||||
compileOnly kotlinStdlib()
|
||||
compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ pill {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(':kotlin-stdlib')
|
||||
compileOnly kotlinStdlib()
|
||||
}
|
||||
|
||||
configurations {
|
||||
|
||||
Reference in New Issue
Block a user