Merge pull request shazam#127 from jbaginski/updated-gradle

Updating Gradle and Android Gradle Plugin
agoda-com · Sep 11, 2017 · dda45bc · dda45bc
2 parents a04760f + 1ab49ab
commit dda45bc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,12 +9,14 @@
  */
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.0-rc-1'
+    gradleVersion = '4.1'
 }
 
 ext.sourceCompatibility = JavaVersion.VERSION_1_8
 ext.targetCompatibility = JavaVersion.VERSION_1_8
 
+ext.androidPlugin = '3.0.0-beta5'
+
 def repos = {
     mavenLocal()
     mavenCentral()

diff --git a/chimprunner-gradle-plugin/build.gradle b/chimprunner-gradle-plugin/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
     compile project(':chimprunner')
-    compile 'com.android.tools.build:gradle:2.3.2'
+    compile "com.android.tools.build:gradle:$androidPlugin"
 }
 
 jar {

diff --git a/fork-common-test-dex/build.gradle b/fork-common-test-dex/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        classpath "com.android.tools.build:gradle:3.0.0-beta5"
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/fork-common-test-dex/gradle/wrapper/gradle-wrapper.properties b/fork-common-test-dex/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-4.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/fork-gradle-plugin/build.gradle b/fork-gradle-plugin/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
     compile project(':fork-runner')
-    compile 'com.android.tools.build:gradle:3.0.0-alpha1'
+    compile "com.android.tools.build:gradle:$androidPlugin"
 }
 
 jar {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 27 11:44:12 BST 2016
+#Thu Sep 07 10:26:11 BST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip