From 17c16eaa9efac10d04db8c61146c2c93dcdd2ee1 Mon Sep 17 00:00:00 2001
From: Thor Andreas Rognan <thor.rognan@gmail.com>
Date: Fri, 30 Mar 2018 04:41:01 +0200
Subject: [PATCH] Upgrade to Gradle 4.6

Issue: SPR-16475
---
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 54329 -> 54329 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 spring-beans/spring-beans.gradle         |   3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index cd4b629afc8..0a2bf098461 100644
--- a/build.gradle
+++ b/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"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 01b8bf6b1f99cad9213fc495b33ad5bbab8efd20..f6b961fd5a86aa5fbfe90f707c3138408be7c718 100644
GIT binary patch
delta 63
zcmdnFf_di(<_YF38otMVOtg+<`&jg`h>>A})W$9U4stOw1bDM^ytJG0dGek^{$Mqm
P`48U{U;zt#yzBu0axWc6

delta 63
zcmdnFf_di(<_YF39&&6=6RjiJJ`{Z{Vq};gwQ<Y8gItUZ0p9E!N8@M7PTq6KAFO6G
O|KWQAEMTFJmpuRkN*NRY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2c2bbe5f9a8..bf3de218305 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index ceb20fb7f8f..a93a7981180 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -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)