From 298778cc0989abb7e35c14fff095d8027d65da37 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 18 Sep 2017 12:55:25 +0300
Subject: [PATCH] [build] fix conflict between bulid and jars tasks

The file `backend.native/build/libs/backend.native.jar` was produced
by two different tasks `:backend.native:jar` (default task of Java
Plugin) and `backend.native:jars` (our custom task). This caused the
`:dist: task to never be UP-TO-DATE.
---
 backend.native/build.gradle | 6 +++---
 build.gradle                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index 6b376d8c7aa..25e04f1ae45 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -145,7 +145,7 @@ dependencies {
 }
 
 
-build.dependsOn 'compilerClasses','cli_bcClasses','bc_frontendClasses'
+classes.dependsOn 'compilerClasses','cli_bcClasses','bc_frontendClasses'
 
 
 // These are just a couple of aliases
@@ -210,14 +210,14 @@ task run {
     }
 }
 
-task jars(type: Jar) {
+jar {
     from 'build/classes/cli_bc', 
          'build/classes/compiler', 
          'build/classes/hashInteropStubs', 
          'build/classes/llvmInteropStubs',
          'build/resources/compiler'
 
-    dependsOn 'build', ':runtime:hostRuntime', 'external_jars'
+    dependsOn ':runtime:hostRuntime', 'external_jars'
 }
 
 task external_jars(type: Copy) {
diff --git a/build.gradle b/build.gradle
index 74b21e884ab..a6fc64f33c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -143,7 +143,7 @@ task cross_dist(dependsOn: "crossDist")
 task list_dist(dependsOn: "listDist")
 
 task distCompiler(type: Copy) {
-    dependsOn ':backend.native:jars'
+    dependsOn ':backend.native:jar'
     dependsOn ':utilities:jar'
     dependsOn ':klib:jar'
     dependsOn ':shared:jar'