Upgrade to Gradle 4.6

Issue: SPR-16475
This commit is contained in:
Thor Andreas Rognan
2018-03-30 04:41:01 +02:00
committed by Sam Brannen
parent 71cacff8c2
commit 17c16eaa9e
4 changed files with 4 additions and 3 deletions

View File

@@ -27,6 +27,7 @@ compileGroovy {
// This module also builds Kotlin code and the compileKotlin task
// naturally depends on compileJava.
// We need to redefine dependencies to break task cycles.
compileGroovy.dependsOn = compileGroovy.taskDependencies.values - 'compileJava'
def deps = compileGroovy.taskDependencies.immutableValues + compileGroovy.taskDependencies.mutableValues
compileGroovy.dependsOn = deps - 'compileJava'
compileKotlin.dependsOn(compileGroovy)
compileKotlin.classpath += files(compileGroovy.destinationDir)