File tree 3 files changed +14
-10
lines changed 3 files changed +14
-10
lines changed Original file line number Diff line number Diff line change @@ -100,4 +100,8 @@ dependencies {
100
100
101
101
// UIAutomator Testing. Learn about this dependency in this projects README file.
102
102
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
+
103
107
}
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ buildscript {
5
5
jcenter()
6
6
}
7
7
dependencies {
8
- classpath ' com.android.tools.build:gradle:2.1.0-alpha3 '
8
+ classpath ' com.android.tools.build:gradle:2.2.1 '
9
9
10
10
// NOTE: Do not place your application dependencies here; they belong
11
11
// in the individual module build.gradle files
@@ -20,16 +20,16 @@ allprojects {
20
20
21
21
ext {
22
22
minSdkVersion = 10
23
- targetSdkVersion = 23
24
- compileSdkVersion = 23
25
- buildToolsVersion = " 23 .0.2 "
23
+ targetSdkVersion = 25
24
+ compileSdkVersion = 25
25
+ buildToolsVersion = " 25 .0.1 "
26
26
27
- supportLibVersion = " 23 .0.1"
27
+ supportLibVersion = " 25 .0.1"
28
28
junitVersion = " 4.12"
29
29
mockitoVersion = " 1.10.19"
30
30
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 "
34
34
uiautomatorVersion = " 2.1.2"
35
35
}
Original file line number Diff line number Diff line change 1
- # Mon Jul 06 15:19:16 BST 2015
1
+ # Tue Dec 06 13:05:10 GMT 2016
2
2
distributionBase =GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
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
You can’t perform that action at this time.
0 commit comments