build: Make gradle plugin depending on dist task
This commit is contained in:
+1
-1
@@ -342,7 +342,7 @@ targetList.each { target ->
|
|||||||
}
|
}
|
||||||
|
|
||||||
task dist {
|
task dist {
|
||||||
dependsOn 'distCompiler', 'distRuntime', ':tools:kotlin-native-gradle-plugin:dist'
|
dependsOn 'distCompiler', 'distRuntime'
|
||||||
}
|
}
|
||||||
|
|
||||||
task crossDist {
|
task crossDist {
|
||||||
|
|||||||
@@ -46,15 +46,8 @@ repositories {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
|
||||||
konanCompiler
|
|
||||||
}
|
|
||||||
|
|
||||||
evaluationDependsOn(':tools:helpers')
|
evaluationDependsOn(':tools:helpers')
|
||||||
dependencies {
|
dependencies {
|
||||||
// TODO: do we need it?
|
|
||||||
konanCompiler project(':backend.native')
|
|
||||||
|
|
||||||
compile project(':tools:helpers')
|
compile project(':tools:helpers')
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile gradleApi()
|
compile gradleApi()
|
||||||
@@ -62,15 +55,10 @@ dependencies {
|
|||||||
|
|
||||||
jar {
|
jar {
|
||||||
dependsOn(':tools:helpers:jar')
|
dependsOn(':tools:helpers:jar')
|
||||||
|
dependsOn(':cross_dist')
|
||||||
from (rootProject.findProject(':tools:helpers').sourceSets.main.output)
|
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) {
|
task deleteDist(type: Delete) {
|
||||||
delete 'dist'
|
delete 'dist'
|
||||||
}
|
}
|
||||||
@@ -93,7 +81,6 @@ publishing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bintray {
|
bintray {
|
||||||
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
|
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
|
||||||
key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
|
key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
|
||||||
|
|||||||
Reference in New Issue
Block a user