Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidTestingBlueprint/app/build.gradle
	AndroidTestingBlueprint/module-android-library/build.gradle
	AndroidTestingBlueprint/module-flavor1-androidTest-only/build.gradle

Author: yongce

AndroidTestingBlueprint/README.md

@@ -114,11 +114,9 @@ Run normally (see above).
 Execute:
 
 ```
-./gradlew module-flavor1-androidTest-only:assembleDebug module-flavor1-androidTest-only:connectedCheck
+./gradlew module-flavor1-androidTest-only:connectedAndroidTest
 ```
 
-Note: `assembleDebug` has to be run before `connectedCheck`. See [bug](https://code.google.com/p/android/issues/detail?id=180689), which will be fixed in 1.3.1 .
-
 ##### From command-line via adb
 You need to install the app and test app first:
 
@@ -181,7 +179,7 @@ Since Gradle Android Plugin version 1.2.0 using ProGuard has become a lot easier
 To try it out just uncomment the minify section for the debug build type in the app modules `build.gradle` file.
 
 ## Custom Gradle command-line arguments
-Gradle allows you to pass custom arguments to `AndroidJUnitRunner`. This is equivalent to running `adb shell am instrument -w -e <argName> <argValue>`.
+Gradle allows you to pass custom arguments to `AndroidJUnitRunner`. This is equivalent to running `adb shell am instrument -w -e <argName> <argValue> com.example.android.testing.blueprint.test/android.support.test.runner.AndroidJUnitRunner`.
 Custom arguments can be particularly useful when you just want to run a specific test class/method/qualifier.
 
 To pass a custom argument the -Pcom.android.tools.instrumentationTestRunnerArgs=argName=argValue
@@ -190,19 +188,19 @@ property needs to be used, in conjunction with `argName` and `argValue`. Multipl
 For instance, to run all tests annotated with the `@Large` test size qualifier in the app module, execute:
 
 ``` sh
-`./gradlew app:connectedCheck -Pcom.android.tools.instrumentationTestRunnerArgs=size=large`
+./gradlew app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.size=large
 ```
 
 To only run tests for a specific test class, i.e. EspressoTest, execute:
 
 ``` sh
-`./gradlew app:connectedCheck -Pcom.android.tools.instrumentationTestRunnerArgs=class=com.example.android.testing.blueprint.ui.espresso.EspressoTest`
+./gradlew app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.android.testing.blueprint.ui.espresso.EspressoTest
 ```
 
 To pass in an arbitrary argument which can be accessed in a test at runtime, execute:
 
 ``` sh
-`./gradlew module-flavor1-androidTest-only:connectedCheck -Pcom.android.tools.instrumentationTestRunnerArgs=argument1=make_test_fail`
+./gradlew module-flavor1-androidTest-only:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.argument1=make_test_fail
 ```
 All arguments passed through command line can also be specified in the project's build.gradle file, which is
 great for specifying values which are required by the test harness itself. The `argument1` from the previous

AndroidTestingBlueprint/app/build.gradle

@@ -68,30 +68,30 @@ android {
 
 dependencies {
     // App's dependencies, including test
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibVersion
 
     compile project(':module-plain-java') // Optional module for non-Android code
     compile project(':module-android-library') // Optional module for additional Android code
 
     // Dependencies for local unit tests
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-all:1.10.19'
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
+    testCompile 'junit:junit:' + rootProject.ext.junitVersion
+    testCompile 'org.mockito:mockito-all:' + rootProject.ext.mockitoVersion
+    testCompile 'org.hamcrest:hamcrest-all:' + rootProject.ext.hamcrestVersion
 
     // Android Testing Support Library's runner and rules
-    androidTestCompile 'com.android.support.test:runner:0.3'
-    androidTestCompile 'com.android.support.test:rules:0.3'
+    androidTestCompile 'com.android.support.test:runner:' + rootProject.ext.runnerVersion
+    androidTestCompile 'com.android.support.test:rules:' + rootProject.ext.rulesVersion
 
     // Espresso UI Testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:' + rootProject.ext.espressoVersion
 
     // Espresso-Contrib, Intents and Web dependencies are not used in this project.
     /*
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:' + rootProject.ext.espressoVersion
+    androidTestCompile 'com.android.support.test.espresso:espresso-intents:' + rootProject.ext.espressoVersion
+    androidTestCompile 'com.android.support.test.espresso:espresso-web:' + rootProject.ext.espressoVersion
      */
 
     // UIAutomator Testing. Learn about this dependency in this projects README file.
-    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:' + rootProject.ext.uiautomatorVersion
 }

AndroidTestingBlueprint/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,7 +20,16 @@ allprojects {
 
 ext {
     minSdkVersion = 10
-    targetSdkVersion = 22
+    targetSdkVersion = 23
     compileSdkVersion = 23
-    buildToolsVersion = "23.0.0"
+    buildToolsVersion = "23.0.1"
+
+    supportLibVersion = "23.0.1"
+    junitVersion = "4.12"
+    mockitoVersion = "1.10.19"
+    hamcrestVersion = "1.3"
+    runnerVersion = "0.4"
+    rulesVersion = "0.4"
+    espressoVersion = "2.2.1"
+    uiautomatorVersion = "2.1.2"
 }

AndroidTestingBlueprint/module-android-library/build.gradle

@@ -21,6 +21,6 @@ android {
 
 dependencies {
     // Android Testing Support Library's runner and rules
-    androidTestCompile 'com.android.support.test:runner:0.3'
-    androidTestCompile 'com.android.support.test:rules:0.3'
+    androidTestCompile 'com.android.support.test:runner:' + rootProject.ext.runnerVersion
+    androidTestCompile 'com.android.support.test:rules:' + rootProject.ext.rulesVersion
 }

AndroidTestingBlueprint/module-flavor1-androidTest-only/build.gradle

@@ -22,7 +22,7 @@ android {
 
 dependencies {
     // Android Testing Support Library's runner and rules and hamcrest matchers
-    compile 'com.android.support.test:runner:0.3'
-    compile 'com.android.support.test:rules:0.3'
-    compile 'org.hamcrest:hamcrest-core:1.3'
+    compile 'com.android.support.test:runner:' + rootProject.ext.runnerVersion
+    compile 'com.android.support.test:rules:' + rootProject.ext.rulesVersion
+    compile 'org.hamcrest:hamcrest-core:' + rootProject.ext.hamcrestVersion
 }

AndroidTestingBlueprint/module-plain-java/build.gradle

@@ -7,6 +7,6 @@ targetCompatibility = 1.7
 
 dependencies {
     // Dependencies for local unit tests
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.hamcrest:hamcrest-core:1.3'
+    testCompile 'junit:junit:' + rootProject.ext.junitVersion
+    testCompile 'org.hamcrest:hamcrest-core:' + rootProject.ext.hamcrestVersion
 }