Put androidx.ext.junit runner into atsl group and match versions

mikelhm · May 13, 2019 · aaa5438 · aaa5438
1 parent aa2b73e
commit aaa5438
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 110 deletions.
diff --git a/BasicRxJavaSample/versions.gradle b/BasicRxJavaSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/BasicRxJavaSampleKotlin/versions.gradle b/BasicRxJavaSampleKotlin/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/BasicSample/versions.gradle b/BasicSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/GithubBrowserSample/versions.gradle b/GithubBrowserSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/NavigationAdvancedSample/versions.gradle b/NavigationAdvancedSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/NavigationBasicSample/versions.gradle b/NavigationBasicSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/PagingSample/versions.gradle b/PagingSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/PagingWithNetworkSample/benchmark/build.gradle b/PagingWithNetworkSample/benchmark/build.gradle
@@ -28,10 +28,10 @@ dependencies {
  implementation deps.support.app_compat
  implementation deps.paging_ktx
 
+ androidTestImplementation deps.atsl.junit
  androidTestImplementation deps.atsl.runner
  androidTestImplementation deps.atsl.rules
  androidTestImplementation deps.arch_core.testing
  androidTestImplementation deps.benchmark
  androidTestImplementation deps.junit
- androidTestImplementation deps.junit_androidx
 }
diff --git a/PagingWithNetworkSample/versions.gradle b/PagingWithNetworkSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"

diff --git a/PersistenceContentProviderSample/versions.gradle b/PersistenceContentProviderSample/versions.gradle
@@ -24,10 +24,8 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0-rc02'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
-versions.atsl_rules = "1.1.1"
-versions.atsl_runner = "1.1.1"
-versions.atsl_junit = "1.1.0"
-versions.benchmark = "1.0.0-alpha01
+versions.atsl = "1.1.1"
+versions.benchmark = "1.0.0-alpha01"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
@@ -37,7 +35,6 @@ versions.fragment = "1.1.0-alpha05"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
-versions.junit_androidx = "1.1.0"
 versions.kotlin = "1.3.20"
 versions.lifecycle = "2.0.0"
 versions.mockito = "2.25.0"
@@ -118,9 +115,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
-atsl.runner = "androidx.test:runner:$versions.atsl_runner"
-atsl.rules = "androidx.test:rules:$versions.atsl_runner"
-atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.junit = "androidx.test.ext:junit:$versions.atsl"
+atsl.runner = "androidx.test:runner:$versions.atsl"
+atsl.rules = "androidx.test:rules:$versions.atsl"
 deps.atsl = atsl
 
 def mockito = [:]
@@ -147,7 +144,6 @@ deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
 deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
 deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
-deps.junit_androidx = "androidx.test.ext:junit:$versions.junit_androidx"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"