Some dependencies updated.

xiahua · Nov 24, 2015 · 727e74c · 727e74c
1 parent 01bc7aa
commit 727e74c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,10 @@ jdk:
 
 android:
   components:
-    - build-tools-23.0.1
+    - platform-tools
+    - tools
     - android-23
+    - build-tools-23.0.2
     - extra-android-m2repository
     - sys-img-armeabi-v7a-android-19
 

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.3.1'
+    classpath 'com.android.tools.build:gradle:1.5.0'
     classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.3') {
       // Workaround for https://github.com/stanfy/spoon-gradle-plugin/issues/33
@@ -48,7 +48,7 @@ def preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
 
 android {
   compileSdkVersion 23
-  buildToolsVersion '23.0.1'
+  buildToolsVersion '23.0.2'
 
   dexOptions {
     // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
@@ -98,6 +98,7 @@ android {
     textReport true
     textOutput 'stdout'
     fatal 'UnusedResources'
+    warning 'ResourceType' //TODO remove eventually with ButterKnife 8.0 release
   }
 
   compileOptions {
@@ -117,16 +118,16 @@ configurations {
 
 configurations.all {
   resolutionStrategy {
-    force 'com.android.support:support-annotations:23.0.1'
+    force 'com.android.support:support-annotations:23.1.1'
   }
 }
 
 dependencies {
-  compile 'com.android.support:support-v4:23.0.1'
-  compile 'com.android.support:support-annotations:23.0.1'
-  compile 'com.android.support:appcompat-v7:23.0.1'
-  compile 'com.android.support:recyclerview-v7:23.0.1'
-  compile 'com.android.support:design:23.0.1'
+  compile 'com.android.support:support-v4:23.1.1'
+  compile 'com.android.support:support-annotations:23.1.1'
+  compile 'com.android.support:appcompat-v7:23.1.1'
+  compile 'com.android.support:recyclerview-v7:23.1.1'
+  compile 'com.android.support:design:23.1.1'
 
   compile 'com.squareup.dagger:dagger:1.2.2'
   apt 'com.squareup.dagger:dagger-compiler:1.2.2'

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.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip