Skip to content

Commit

Permalink
Consistent gradle version with update_version script
Browse files Browse the repository at this point in the history
  • Loading branch information
dlam committed May 13, 2019
1 parent 2ced35f commit 48fe977
Show file tree
Hide file tree
Showing 28 changed files with 90 additions and 66 deletions.
2 changes: 1 addition & 1 deletion BasicRxJavaSample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions BasicRxJavaSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions BasicRxJavaSampleKotlin/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
2 changes: 1 addition & 1 deletion BasicSample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions BasicSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions GithubBrowserSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions NavigationAdvancedSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions NavigationBasicSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
2 changes: 1 addition & 1 deletion PagingSample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions PagingSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
2 changes: 1 addition & 1 deletion PagingWithNetworkSample/benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
implementation deps.support.app_compat
implementation deps.paging_ktx

androidTestImplementation deps.atsl.junit
androidTestImplementation deps.atsl.ext_junit
androidTestImplementation deps.atsl.runner
androidTestImplementation deps.atsl.rules
androidTestImplementation deps.arch_core.testing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 01 16:50:27 PDT 2019
#Thu Feb 22 10:53:38 GMT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions PagingWithNetworkSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions PersistenceContentProviderSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions PersistenceMigrationsSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
2 changes: 1 addition & 1 deletion WorkManagerSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
implementation deps.glide.runtime

testImplementation deps.junit
androidTestImplementation deps.atsl.junit
androidTestImplementation deps.atsl.ext_junit
androidTestImplementation deps.atsl.runner
androidTestImplementation deps.atsl.rules
androidTestImplementation deps.espresso.core
Expand Down
2 changes: 1 addition & 1 deletion WorkManagerSample/benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
implementation deps.work.runtime_ktx

androidTestImplementation deps.junit
androidTestImplementation deps.atsl.junit
androidTestImplementation deps.atsl.ext_junit
androidTestImplementation deps.atsl.runner
androidTestImplementation deps.atsl.rules
androidTestImplementation deps.benchmark
Expand Down
4 changes: 2 additions & 2 deletions WorkManagerSample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 01 16:53:14 PDT 2019
#Thu Feb 22 10:53:38 GMT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions WorkManagerSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down
2 changes: 1 addition & 1 deletion gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
10 changes: 6 additions & 4 deletions versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def versions = [:]
versions.android_gradle_plugin = '3.4.0-rc02'
versions.apache_commons = "2.5"
versions.arch_core = "2.0.1"
versions.atsl = "1.1.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.constraint_layout = "2.0.0-alpha2"
versions.core_ktx = "1.0.0"
Expand Down Expand Up @@ -115,9 +117,9 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.junit = "androidx.test.ext:junit:$versions.atsl"
atsl.runner = "androidx.test:runner:$versions.atsl"
atsl.rules = "androidx.test:rules:$versions.atsl"
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
deps.atsl = atsl

def mockito = [:]
Expand Down

0 comments on commit 48fe977

Please sign in to comment.