diff --git a/build.gradle b/build.gradle index b55fc00554d..c970dab5238 100644 --- a/build.gradle +++ b/build.gradle @@ -342,7 +342,7 @@ targetList.each { target -> } task dist { - dependsOn 'distCompiler', 'distRuntime', ':tools:kotlin-native-gradle-plugin:dist' + dependsOn 'distCompiler', 'distRuntime' } task crossDist { diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle index d0d65e1ae98..b8dd80e1a7c 100644 --- a/tools/kotlin-native-gradle-plugin/build.gradle +++ b/tools/kotlin-native-gradle-plugin/build.gradle @@ -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')