Build: Centralize compiler dist build logic in :kotlin-compiler project

This commit is contained in:
Vyacheslav Gerasimov
2019-06-19 19:02:40 +03:00
parent 62126d0e43
commit db3b01d2d4
52 changed files with 270 additions and 305 deletions
+2 -4
View File
@@ -30,11 +30,9 @@ sourceSets {
"test" { projectDefault() }
}
val jar = runtimeJar {}
runtimeJar()
testsJar {}
dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")
testsJar()
projectTest(parallel = true) {
workingDir = rootDir
@@ -47,8 +47,6 @@ sourceSets {
runtimeJar()
dist()
testsJar()
projectTest {
@@ -75,7 +75,7 @@ sourceSets {
testsJar {}
projectTest(parallel = true) {
dependsOn(":kotlin-android-extensions-runtime:dist")
dependsOn(":dist")
workingDir = rootDir
useAndroidSdk()
useAndroidJar()
@@ -22,5 +22,3 @@ publish()
runtimeJar()
sourcesJar()
javadocJar()
dist(targetName = "android-extensions-runtime.jar")
-2
View File
@@ -35,5 +35,3 @@ projectTest {
}
runtimeJar()
dist()
-1
View File
@@ -39,6 +39,5 @@ publish()
sourcesJar()
javadocJar()
dist()
testsJar()
+1 -3
View File
@@ -18,9 +18,7 @@ sourceSets {
"test" { projectDefault() }
}
testsJar {}
dist()
testsJar()
projectTest {
workingDir = rootDir
@@ -60,5 +60,3 @@ runtimeJar()
sourcesJar()
javadocJar()
dist()
@@ -21,5 +21,3 @@ publish()
runtimeJar()
sourcesJar()
javadocJar()
dist(targetName = "kotlin-annotation-processing-runtime.jar")
@@ -36,9 +36,7 @@ sourceSets {
runtimeJar()
sourcesJar()
javadocJar()
testsJar {}
dist(targetName = the<BasePluginConvention>().archivesBaseName + ".jar")
testsJar()
projectTest(parallel = true) {
workingDir = rootDir
-2
View File
@@ -34,8 +34,6 @@ runtimeJar()
testsJar()
dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")
projectTest(parallel = true) {
workingDir = rootDir
}
@@ -34,13 +34,9 @@ publish()
runtimeJar()
sourcesJar()
javadocJar()
testsJar {}
dist {
rename("kotlin-", "")
}
testsJar()
projectTest(parallel = true) {
dependsOn(":kotlin-stdlib:jvm-minimal-for-test:dist")
dependsOn(":dist")
workingDir = rootDir
}
@@ -50,8 +50,6 @@ runtimeJar()
sourcesJar()
javadocJar()
dist()
projectTest {
workingDir = rootDir
}
@@ -47,12 +47,10 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
publish()
val jar = runtimeJar {}
runtimeJar()
sourcesJar()
javadocJar()
dist()
projectTest {
workingDir = rootDir
}
@@ -47,5 +47,3 @@ publish()
runtimeJar()
sourcesJar()
javadocJar()
dist()