Merge pull request JakeWharton#105 from IgorGanapolsky/master

Update gradle versions.
linjinfa · Nov 10, 2015 · 63647a8 · 63647a8
2 parents 00a0d4f + 1af3186
commit 63647a8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,11 @@ jdk:
 
 android:
   components:
-    - build-tools-21.1.2
-    - android-21
+    - build-tools-23.0.1
+    - android-23
+
+    # Update Android SDK Tools
+    - tools
 
 branches:
   except:

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
   dependencies {
     classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7'
-    classpath 'com.android.tools.build:gradle:1.3.0'
+    classpath 'com.android.tools.build:gradle:1.3.1'
     classpath 'org.aspectj:aspectjtools:1.8.6'
     classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
   }
@@ -24,8 +24,8 @@ allprojects {
 }
 
 ext {
-  compileSdkVersion = 21
-  buildToolsVersion = '21.1.2'
+  compileSdkVersion = 23
+  buildToolsVersion = '23.0.1'
 }
 
 task cleanExample(type: Exec) {

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.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
diff --git a/hugo-example/build.gradle b/hugo-example/build.gradle
@@ -7,7 +7,7 @@ buildscript {
       mavenLocal()
     }
 
-    classpath 'com.android.tools.build:gradle:1.3.0'
+    classpath 'com.android.tools.build:gradle:1.3.1'
     classpath 'com.jakewharton.hugo:hugo-plugin:1.2.2-SNAPSHOT'
   }
 }
@@ -25,8 +25,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 21
-  buildToolsVersion '21.1.2'
+  compileSdkVersion 23
+  buildToolsVersion '23.0.1'
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/hugo-plugin/build.gradle b/hugo-plugin/build.gradle
@@ -8,7 +8,7 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 dependencies {
   compile gradleApi()
   compile localGroovy()
-  compile 'com.android.tools.build:gradle:1.3.0'
+  compile 'com.android.tools.build:gradle:1.3.1'
   compile 'org.aspectj:aspectjtools:1.8.6'
   compile 'org.aspectj:aspectjrt:1.8.6'
 }

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
 include ':hugo-annotations'
 include ':hugo-plugin'
-include ':hugo-runtime'
+include ':hugo-runtime'