azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] fix conflict between bulid and jars tasks

Browse Source 
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.
This commit is contained in:
Aleksey Kladov
2017-09-18 12:55:25 +03:00
committed by ilmat192
parent beea41b406
commit 298778cc09
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+3 -3
View File
@@ -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 // These are just a couple of aliases
@@ -210,14 +210,14 @@ task run {
} }
} }
task jars(type: Jar) { jar {
from 'build/classes/cli_bc', from 'build/classes/cli_bc',
'build/classes/compiler', 'build/classes/compiler',
'build/classes/hashInteropStubs', 'build/classes/hashInteropStubs',
'build/classes/llvmInteropStubs', 'build/classes/llvmInteropStubs',
'build/resources/compiler' 'build/resources/compiler'
dependsOn 'build', ':runtime:hostRuntime', 'external_jars' dependsOn ':runtime:hostRuntime', 'external_jars'
} }
task external_jars(type: Copy) { task external_jars(type: Copy) {
build.gradle
+1 -1
View File
@@ -143,7 +143,7 @@ task cross_dist(dependsOn: "crossDist")
task list_dist(dependsOn: "listDist") task list_dist(dependsOn: "listDist")
task distCompiler(type: Copy) { task distCompiler(type: Copy) {
dependsOn ':backend.native:jars' dependsOn ':backend.native:jar'
dependsOn ':utilities:jar' dependsOn ':utilities:jar'
dependsOn ':klib:jar' dependsOn ':klib:jar'
dependsOn ':shared:jar' dependsOn ':shared:jar'