- Gradle Update

- Groovy Version Conflict Resolved
zeshanarifios · Oct 26, 2018 · 2aeac42 · 2aeac42
1 parent 3ceef67
commit 2aeac42
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -201,7 +201,7 @@ task applyConfig << {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '4.10.2'
 }
 
 def testBuildArguments(workspace, scheme, OS, record) {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -28,7 +28,11 @@ subprojects {
         // get picked up. We only have one buildSrc plugin
         // so it doesn't really matter, but if we ever get more
         // we should figure this out
-        compile 'org.codehaus.groovy:groovy-all:2.6.0-alpha-2'
+        configurations.all {
+            resolutionStrategy {
+                force 'org.codehaus.groovy:groovy-all:2.6.0-alpha-2'
+            }
+        }
         compile gradleApi()
         compile 'org.yaml:snakeyaml:1.14'
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip