Fix kotlin-daemon-client project config and publications, fix problem with uploadArchives task
This commit is contained in:
@@ -18,7 +18,7 @@ import java.io.File
|
|||||||
fun Project.classesDirsArtifact(): FileCollection {
|
fun Project.classesDirsArtifact(): FileCollection {
|
||||||
val classesDirsCfg = configurations.getOrCreate("classes-dirs")
|
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"]
|
val classesTask = tasks["classes"]
|
||||||
|
|
||||||
|
|||||||
@@ -28,3 +28,4 @@ sourcesJar()
|
|||||||
|
|
||||||
dist()
|
dist()
|
||||||
|
|
||||||
|
publish()
|
||||||
|
|||||||
@@ -107,3 +107,8 @@ projectTest {
|
|||||||
testsJar {}
|
testsJar {}
|
||||||
|
|
||||||
classesDirsArtifact()
|
classesDirsArtifact()
|
||||||
|
|
||||||
|
|
||||||
|
task("uploadArchives") {
|
||||||
|
// hides rule-based task with the same name, which appears to be broken in this project
|
||||||
|
}
|
||||||
|
|||||||
@@ -105,7 +105,6 @@ include ":kotlin-build-common",
|
|||||||
":kotlin-compiler",
|
":kotlin-compiler",
|
||||||
":kotlin-compiler-embeddable",
|
":kotlin-compiler-embeddable",
|
||||||
":kotlin-compiler-client-embeddable",
|
":kotlin-compiler-client-embeddable",
|
||||||
":kotlin-daemon-client",
|
|
||||||
":kotlin-reflect",
|
":kotlin-reflect",
|
||||||
":kotlin-ant",
|
":kotlin-ant",
|
||||||
":compiler:tests-java8",
|
":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').projectDir = "$rootDir/prepare/compiler" as File
|
||||||
project(':kotlin-compiler-embeddable').projectDir = "$rootDir/prepare/compiler-embeddable" 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-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-preloader').projectDir = "$rootDir/compiler/preloader" as File
|
||||||
project(':kotlin-build-common').projectDir = "$rootDir/build-common" as File
|
project(':kotlin-build-common').projectDir = "$rootDir/build-common" as File
|
||||||
project(':compiler:cli-common').projectDir = "$rootDir/compiler/cli/cli-common" as File
|
project(':compiler:cli-common').projectDir = "$rootDir/compiler/cli/cli-common" as File
|
||||||
|
|||||||
Reference in New Issue
Block a user