build: Make gradle plugin depending on dist task

This commit is contained in:
Ilya Matveev
2017-05-30 19:06:23 +07:00
committed by ilmat192
parent 8acd02dfee
commit 4f9a1e9a33
2 changed files with 2 additions and 15 deletions
+1 -1
View File
@@ -342,7 +342,7 @@ targetList.each { target ->
}
task dist {
dependsOn 'distCompiler', 'distRuntime', ':tools:kotlin-native-gradle-plugin:dist'
dependsOn 'distCompiler', 'distRuntime'
}
task crossDist {
+1 -14
View File
@@ -46,15 +46,8 @@ repositories {
mavenCentral()
}
configurations {
konanCompiler
}
evaluationDependsOn(':tools:helpers')
dependencies {
// TODO: do we need it?
konanCompiler project(':backend.native')
compile project(':tools:helpers')
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile gradleApi()
@@ -62,15 +55,10 @@ dependencies {
jar {
dependsOn(':tools:helpers:jar')
dependsOn(':cross_dist')
from (rootProject.findProject(':tools:helpers').sourceSets.main.output)
}
task dist(type: Copy) {
dependsOn 'jar'
destinationDir file('dist')
from (jar.outputs.files)
}
task deleteDist(type: Delete) {
delete 'dist'
}
@@ -93,7 +81,6 @@ publishing {
}
}
bintray {
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')