Skip to content

Commit 8330550

Browse files
committed
Updates to build:gradle:2.2.1, tools 25.0.1, slib 25.0.1
1 parent f72034c commit 8330550

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

AndroidTestingBlueprint/app/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,11 @@ dependencies {
100100

101101
// UIAutomator Testing. Learn about this dependency in this projects README file.
102102
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:' + rootProject.ext.uiautomatorVersion
103+
104+
// Resolve conflicts between main and test APK:
105+
androidTestCompile "com.android.support:support-annotations:$rootProject.supportLibVersion"
106+
androidTestCompile "com.android.support:support-v4:$rootProject.supportLibVersion"
107+
androidTestCompile "com.android.support:recyclerview-v7:$rootProject.supportLibVersion"
108+
androidTestCompile "com.android.support:appcompat-v7:$rootProject.supportLibVersion"
109+
androidTestCompile "com.android.support:design:$rootProject.supportLibVersion"
103110
}

AndroidTestingBlueprint/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0-alpha3'
8+
classpath 'com.android.tools.build:gradle:2.2.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
@@ -22,14 +22,14 @@ ext {
2222
minSdkVersion = 10
2323
targetSdkVersion = 23
2424
compileSdkVersion = 23
25-
buildToolsVersion = "23.0.2"
25+
buildToolsVersion = "25.0.1"
2626

27-
supportLibVersion = "23.0.1"
27+
supportLibVersion = "25.0.1"
2828
junitVersion = "4.12"
2929
mockitoVersion = "1.10.19"
3030
hamcrestVersion = "1.3"
31-
runnerVersion = "0.4.1"
32-
rulesVersion = "0.4.1"
33-
espressoVersion = "2.2.1"
31+
runnerVersion = "0.5"
32+
rulesVersion = "0.5"
33+
espressoVersion = "2.2.2"
3434
uiautomatorVersion = "2.1.2"
3535
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jul 06 15:19:16 BST 2015
1+
#Tue Dec 06 13:05:10 GMT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)