From 8330550e0551a702ffaf1375afc2c9343aca2043 Mon Sep 17 00:00:00 2001
From: Jose Alcerreca <jalc@google.com>
Date: Tue, 6 Dec 2016 14:09:50 +0000
Subject: [PATCH 1/2] Updates to build:gradle:2.2.1, tools 25.0.1, slib 25.0.1

---
 AndroidTestingBlueprint/app/build.gradle             |  7 +++++++
 AndroidTestingBlueprint/build.gradle                 | 12 ++++++------
 .../gradle/wrapper/gradle-wrapper.properties         |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/AndroidTestingBlueprint/app/build.gradle b/AndroidTestingBlueprint/app/build.gradle
index 62d08bf..4ce521d 100644
--- a/AndroidTestingBlueprint/app/build.gradle
+++ b/AndroidTestingBlueprint/app/build.gradle
@@ -100,4 +100,11 @@ dependencies {
 
     // UIAutomator Testing. Learn about this dependency in this projects README file.
     androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:' + rootProject.ext.uiautomatorVersion
+
+    // Resolve conflicts between main and test APK:
+    androidTestCompile "com.android.support:support-annotations:$rootProject.supportLibVersion"
+    androidTestCompile "com.android.support:support-v4:$rootProject.supportLibVersion"
+    androidTestCompile "com.android.support:recyclerview-v7:$rootProject.supportLibVersion"
+    androidTestCompile "com.android.support:appcompat-v7:$rootProject.supportLibVersion"
+    androidTestCompile "com.android.support:design:$rootProject.supportLibVersion"
 }
diff --git a/AndroidTestingBlueprint/build.gradle b/AndroidTestingBlueprint/build.gradle
index 94b03f4..1bc3c88 100644
--- a/AndroidTestingBlueprint/build.gradle
+++ b/AndroidTestingBlueprint/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0-alpha3'
+        classpath 'com.android.tools.build:gradle:2.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,14 +22,14 @@ ext {
     minSdkVersion = 10
     targetSdkVersion = 23
     compileSdkVersion = 23
-    buildToolsVersion = "23.0.2"
+    buildToolsVersion = "25.0.1"
 
-    supportLibVersion = "23.0.1"
+    supportLibVersion = "25.0.1"
     junitVersion = "4.12"
     mockitoVersion = "1.10.19"
     hamcrestVersion = "1.3"
-    runnerVersion = "0.4.1"
-    rulesVersion = "0.4.1"
-    espressoVersion = "2.2.1"
+    runnerVersion = "0.5"
+    rulesVersion = "0.5"
+    espressoVersion = "2.2.2"
     uiautomatorVersion = "2.1.2"
 }
diff --git a/AndroidTestingBlueprint/gradle/wrapper/gradle-wrapper.properties b/AndroidTestingBlueprint/gradle/wrapper/gradle-wrapper.properties
index 97b6946..1bbecb9 100644
--- a/AndroidTestingBlueprint/gradle/wrapper/gradle-wrapper.properties
+++ b/AndroidTestingBlueprint/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 06 15:19:16 BST 2015
+#Tue Dec 06 13:05:10 GMT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

From 114623010c320594825a1d196d7fa53f58f5cea2 Mon Sep 17 00:00:00 2001
From: Jose Alcerreca <jalc@google.com>
Date: Tue, 6 Dec 2016 14:56:36 +0000
Subject: [PATCH 2/2] Removes appcompat from androidTestCompile to fix errors

---
 AndroidTestingBlueprint/app/build.gradle | 5 +----
 AndroidTestingBlueprint/build.gradle     | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/AndroidTestingBlueprint/app/build.gradle b/AndroidTestingBlueprint/app/build.gradle
index 4ce521d..1a7b53a 100644
--- a/AndroidTestingBlueprint/app/build.gradle
+++ b/AndroidTestingBlueprint/app/build.gradle
@@ -103,8 +103,5 @@ dependencies {
 
     // Resolve conflicts between main and test APK:
     androidTestCompile "com.android.support:support-annotations:$rootProject.supportLibVersion"
-    androidTestCompile "com.android.support:support-v4:$rootProject.supportLibVersion"
-    androidTestCompile "com.android.support:recyclerview-v7:$rootProject.supportLibVersion"
-    androidTestCompile "com.android.support:appcompat-v7:$rootProject.supportLibVersion"
-    androidTestCompile "com.android.support:design:$rootProject.supportLibVersion"
+
 }
diff --git a/AndroidTestingBlueprint/build.gradle b/AndroidTestingBlueprint/build.gradle
index 1bc3c88..da60679 100644
--- a/AndroidTestingBlueprint/build.gradle
+++ b/AndroidTestingBlueprint/build.gradle
@@ -20,8 +20,8 @@ allprojects {
 
 ext {
     minSdkVersion = 10
-    targetSdkVersion = 23
-    compileSdkVersion = 23
+    targetSdkVersion = 25
+    compileSdkVersion = 25
     buildToolsVersion = "25.0.1"
 
     supportLibVersion = "25.0.1"