Merge pull request square#267 from square/ray/agp-3.0.0-alpha5

Upgrade to Android Gradle Plugin 3.0.0-alpha5
xiaowei20152012 · Jul 6, 2017 · 821b495 · 821b495
2 parents 444a787 + 7d1b501
commit 821b495
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 ext.deps = [
-    android_gradle_plugin      : 'com.android.tools.build:gradle:2.4.0-alpha7',
+    android_gradle_plugin      : 'com.android.tools.build:gradle:3.0.0-alpha5',
 ]
 
 ext.minSdkVersion = 14
@@ -14,11 +14,19 @@ allprojects {
   buildscript {
     repositories {
       jcenter()
+
+      maven {
+        url "https://maven.google.com"
+      }
     }
   }
 
   repositories {
     jcenter()
+
+    maven {
+      url "https://maven.google.com"
+    }
   }
 
   afterEvaluate { project ->

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
diff --git a/gradlew b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }