Fix kotlin-daemon-client project config and publications, fix problem with uploadArchives task

This commit is contained in:
Ilya Chernikov
2017-09-08 19:29:58 +03:00
parent 5dfcac18b7
commit 02ec70e9f1
4 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ import java.io.File
fun Project.classesDirsArtifact(): FileCollection {
val classesDirsCfg = configurations.getOrCreate("classes-dirs")
val classesDirs = the<JavaPluginConvention>().sourceSets["main"].output.classesDirs
val classesDirs = the<JavaPluginConvention>().sourceSets["main"].output.classesDirs
val classesTask = tasks["classes"]
@@ -28,3 +28,4 @@ sourcesJar()
dist()
publish()
+5
View File
@@ -107,3 +107,8 @@ projectTest {
testsJar {}
classesDirsArtifact()
task("uploadArchives") {
// hides rule-based task with the same name, which appears to be broken in this project
}
-2
View File
@@ -105,7 +105,6 @@ include ":kotlin-build-common",
":kotlin-compiler",
":kotlin-compiler-embeddable",
":kotlin-compiler-client-embeddable",
":kotlin-daemon-client",
":kotlin-reflect",
":kotlin-ant",
":compiler:tests-java8",
@@ -154,7 +153,6 @@ project(':kotlin-reflect').projectDir = "$rootDir/libraries/tools/kotlin-reflect
project(':kotlin-compiler').projectDir = "$rootDir/prepare/compiler" as File
project(':kotlin-compiler-embeddable').projectDir = "$rootDir/prepare/compiler-embeddable" as File
project(':kotlin-compiler-client-embeddable').projectDir = "$rootDir/prepare/compiler-client-embeddable" as File
project(':kotlin-daemon-client').projectDir = "$rootDir/prepare/daemon-client" as File
project(':kotlin-preloader').projectDir = "$rootDir/compiler/preloader" as File
project(':kotlin-build-common').projectDir = "$rootDir/build-common" as File
project(':compiler:cli-common').projectDir = "$rootDir/compiler/cli/cli-common" as File