Merge pull request #10 from ycdev-fork/master

Add variables for build tools versions

Author: slinzner

AndroidTestingBlueprint/app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     /*
     Test only modules require other artifacts like the classes.jar to be published, so the test can
@@ -12,9 +12,10 @@ android {
     publishNonDefault true
 
     defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+
         applicationId 'com.example.android.testing.blueprint'
-        minSdkVersion 10
-        targetSdkVersion 23
         versionCode 1
         versionName '1.0'
 
@@ -67,30 +68,30 @@ android {
 
 dependencies {
     // App's dependencies, including test
-    compile 'com.android.support:appcompat-v7:23.0.1'
+    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.4'
-    androidTestCompile 'com.android.support.test:rules:0.4'
+    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.1'
+    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.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2.1'
+    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.2'
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:' + rootProject.ext.uiautomatorVersion
 }

AndroidTestingBlueprint/build.gradle

@@ -17,3 +17,19 @@ allprojects {
         jcenter()
     }
 }
+
+ext {
+    minSdkVersion = 10
+    targetSdkVersion = 23
+    compileSdkVersion = 23
+    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

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 10
-        targetSdkVersion 23
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+
         versionCode 1
         versionName "1.0"
 
@@ -20,6 +21,6 @@ android {
 
 dependencies {
     // Android Testing Support Library's runner and rules
-    androidTestCompile 'com.android.support.test:runner:0.4'
-    androidTestCompile 'com.android.support.test:rules:0.4'
+    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

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.test' // A plugin used for test-only-modules
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion = '23.0.1'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 10
-        targetSdkVersion 23
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+
         // The package name of the test app
         testApplicationId 'com.example.android.testing.blueprint.test'
         // The Instrumentation test runner used to run tests.
@@ -21,7 +22,7 @@ android {
 
 dependencies {
     // Android Testing Support Library's runner and rules and hamcrest matchers
-    compile 'com.android.support.test:runner:0.4'
-    compile 'com.android.support.test:rules:0.4'
-    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
 }