Build: implement useBootstrapStdlib flag

Excludes stdlib projects from build and uses bootstrap stdlib artifacts

 #KT-29205
This commit is contained in:
Vyacheslav Gerasimov
2019-01-16 07:07:27 +03:00
parent 9973446e02
commit f58acbeef5
83 changed files with 150 additions and 118 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
compile(project(":compiler:cli"))
compile(project(":compiler:frontend"))
compile(project(":compiler:backend"))
compile(project(":kotlin-stdlib"))
compile(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
compile(project(":kotlin-reflect"))
compile(projectTests(":compiler:tests-common"))
+5 -8
View File
@@ -37,19 +37,16 @@ fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) {
}
}
val depDistProjects = listOf(
":kotlin-script-runtime",
":kotlin-stdlib",
":kotlin-test:kotlin-test-jvm"
)
val antLauncherJar by configurations.creating
dependencies {
testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
depDistProjects.forEach {
testCompile(project(it))
}
testCompile(project(":kotlin-script-runtime"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(kotlinStdlib())
testCompile(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+1 -1
View File
@@ -9,7 +9,7 @@ plugins {
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-stdlib"))
compile(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
}
+2 -2
View File
@@ -8,10 +8,10 @@ jvmTarget = "1.6"
dependencies {
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
compileOnly(project(":kotlin-stdlib"))
compileOnly(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":kotlin-stdlib"))
testCompile(kotlinStdlib())
testCompileOnly("org.jetbrains:annotations:13.0")
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
@@ -11,7 +11,7 @@ dependencies {
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(project(":kotlin-stdlib"))
compile(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
compileOnly(project(":js:js.frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+1 -1
View File
@@ -9,7 +9,7 @@ jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":kotlin-stdlib"))
compile(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
compileOnly(project(":kotlin-reflect-api"))
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
@@ -21,7 +21,7 @@ dependencies {
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
testCompile(project(":kotlin-stdlib"))
testCompile(kotlinStdlib())
testCompileOnly("org.jetbrains:annotations:13.0")
testCompile(projectTests(":kotlin-build-common"))
testCompile(projectTests(":compiler:tests-common"))
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-stdlib"))
compile(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
testCompile(project(":kotlin-test:kotlin-test-jvm"))
}
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-stdlib"))
compile(kotlinStdlib())
compileOnly("org.jetbrains:annotations:13.0")
compile(project(":core:deserialization"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }