Upgrade to Gradle 4.6

Issue: SPR-16475

Author: rognan

build.gradle

@@ -283,7 +283,7 @@ configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = '4.4.1'
+		gradleVersion = '4.6'
 
 		doLast() {
 			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -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)