Upgrade to latest Android RC

gradle · Feb 23, 2017 · 586d95b · 586d95b
1 parent f5df090
commit 586d95b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta3'
+        classpath 'com.android.tools.build:gradle:2.3.0-rc1'
         classpath ('com.uber:okbuck:0.16.3') {
           exclude module: 'gradle'
         }
@@ -50,14 +50,18 @@ subprojects { project ->
             if (it.name.contains("Test")) {
                 resolutionStrategy {
                     force 'io.reactivex:rxandroid:1.2.1'
-                    force 'com.android.support:appcompat-v7:24.2.1'
-                    force 'com.android.support:recyclerview-v7:24.2.1'
-                    force 'com.android.support:animated-vector-drawable:24.2.1'
-                    force 'com.android.support:support-v4:24.2.1'
+                    force 'com.squareup.okio:okio:1.8.0'
+                    force 'io.reactivex:rxjava:1.1.8'
+                    force 'com.google.auto:auto-common:0.6'
+                    force 'com.android.support:appcompat-v7:25.1.0'
+                    force 'com.android.support:recyclerview-v7:25.1.0'
+                    force 'com.android.support:animated-vector-drawable:25.1.0'
+                    force 'com.android.support:support-v4:25.1.0'
                 }
             }
             resolutionStrategy {
                 force 'com.google.guava:guava:19.0'
+                force 'com.google.auto:auto-common:0.6'
             }
         }
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -25,7 +25,7 @@ def android = [
 
 def annotationProcessor = [
         androidApi          : 'com.google.android:android:4.1.1.4',
-        autoCommon          : 'com.google.auto:auto-common:0.4',
+        autoCommon          : 'com.google.auto:auto-common:0.6',
         autoService         : 'com.google.auto.service:auto-service:1.0-rc2',
         autoValue           : 'com.google.auto.value:auto-value:1.4-rc1',
         autoValueAnnotations: 'com.jakewharton.auto.value:auto-value-annotations:1.2-update1',
@@ -162,7 +162,7 @@ def other = [
         rxrelay              : 'com.jakewharton.rxrelay:rxrelay:1.1.0',
         shuffle              : 'com.meetic.shuffle:shuffle:1.0.8',
         androidApi           : 'com.google.android:android:4.1.1.4',
-        autoCommon           : 'com.google.auto:auto-common:0.4',
+        autoCommon           : 'com.google.auto:auto-common:0.6',
         autoService          : 'com.google.auto.service:auto-service:1.0-rc2',
         autoValueGson        : 'com.ryanharter.auto.value:auto-value-gson:0.3.2-rc1',
         autoValueParcel      : 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.3-rc2',

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.4-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip