Pull

.circleci/config.yml

@@ -131,7 +131,7 @@ workflows:
       - test_navigation_basic_sample
       - test_navigation_advanced_sample
       - test_paging_sample
-      # flaky, deprecated - test_paging_network_sample
+      - test_paging_network_sample
       - test_persistence_content_provider_sample
       # inst tests with flavors - test_persistence_migrations_sample
       # temporarily disabled due to #804 - test_workmanager_sample

BasicRxJavaSample/gradle/wrapper/gradle-wrapper.properties

@@ -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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

BasicRxJavaSample/versions.gradle

@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
 versions.apache_commons = "2.5"
 versions.appcompat = "1.2.0-alpha02"
 versions.arch_core = "2.1.0"
-versions.atsl_core = "1.2.0"
-versions.atsl_junit = "1.1.1"
-versions.atsl_rules = "1.2.0"
-versions.atsl_runner = "1.2.0"
+versions.atsl_core = "1.3.0"
+versions.atsl_junit = "1.1.2"
+versions.atsl_rules = "1.3.0"
+versions.atsl_runner = "1.3.0"
 versions.benchmark = "1.1.0-alpha01"
 versions.cardview = "1.0.0"
 versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.2.0"
-versions.fragment = "1.2.1"
+versions.fragment = "1.2.0"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.1.0-alpha04"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
-versions.room = "2.3.0-alpha01"
+versions.room = "2.4.0-alpha05"
 versions.rx_android = "2.0.1"
 versions.rxjava2 = "2.1.3"
 versions.timber = "4.7.1"
 versions.transition = "1.3.0"
 versions.truth = "1.0.1"
-versions.work = "2.2.0"
+versions.work = "2.6.0"
 ext.versions = versions
 
 def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
 def atsl = [:]
 atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"
 deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"
 room.compiler = "androidx.room:room-compiler:$versions.room"
 room.ktx = "androidx.room:room-ktx:$versions.room"
+room.paging = "androidx.room:room-paging:$versions.room"
 room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
 room.testing = "androidx.room:room-testing:$versions.room"
 deps.room = room

BasicRxJavaSampleKotlin/gradle/wrapper/gradle-wrapper.properties

@@ -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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

BasicRxJavaSampleKotlin/versions.gradle

@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
 versions.apache_commons = "2.5"
 versions.appcompat = "1.2.0-alpha02"
 versions.arch_core = "2.1.0"
-versions.atsl_core = "1.2.0"
-versions.atsl_junit = "1.1.1"
-versions.atsl_rules = "1.2.0"
-versions.atsl_runner = "1.2.0"
+versions.atsl_core = "1.3.0"
+versions.atsl_junit = "1.1.2"
+versions.atsl_rules = "1.3.0"
+versions.atsl_runner = "1.3.0"
 versions.benchmark = "1.1.0-alpha01"
 versions.cardview = "1.0.0"
 versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.2.0"
-versions.fragment = "1.2.1"
+versions.fragment = "1.2.0"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.1.0-alpha04"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
-versions.room = "2.3.0-alpha01"
+versions.room = "2.4.0-alpha05"
 versions.rx_android = "2.0.1"
 versions.rxjava2 = "2.1.3"
 versions.timber = "4.7.1"
 versions.transition = "1.3.0"
 versions.truth = "1.0.1"
-versions.work = "2.2.0"
+versions.work = "2.6.0"
 ext.versions = versions
 
 def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
 def atsl = [:]
 atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"
 deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"
 room.compiler = "androidx.room:room-compiler:$versions.room"
 room.ktx = "androidx.room:room-ktx:$versions.room"
+room.paging = "androidx.room:room-paging:$versions.room"
 room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
 room.testing = "androidx.room:room-testing:$versions.room"
 deps.room = room

BasicSample/gradle/wrapper/gradle-wrapper.properties

@@ -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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

BasicSample/versions.gradle

@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
 versions.apache_commons = "2.5"
 versions.appcompat = "1.2.0-alpha02"
 versions.arch_core = "2.1.0"
-versions.atsl_core = "1.2.0"
-versions.atsl_junit = "1.1.1"
-versions.atsl_rules = "1.2.0"
-versions.atsl_runner = "1.2.0"
+versions.atsl_core = "1.3.0"
+versions.atsl_junit = "1.1.2"
+versions.atsl_rules = "1.3.0"
+versions.atsl_runner = "1.3.0"
 versions.benchmark = "1.1.0-alpha01"
 versions.cardview = "1.0.0"
 versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.2.0"
-versions.fragment = "1.2.1"
+versions.fragment = "1.2.0"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.1.0-alpha04"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
-versions.room = "2.3.0-alpha01"
+versions.room = "2.4.0-alpha05"
 versions.rx_android = "2.0.1"
 versions.rxjava2 = "2.1.3"
 versions.timber = "4.7.1"
 versions.transition = "1.3.0"
 versions.truth = "1.0.1"
-versions.work = "2.2.0"
+versions.work = "2.6.0"
 ext.versions = versions
 
 def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
 def atsl = [:]
 atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"
 deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"
 room.compiler = "androidx.room:room-compiler:$versions.room"
 room.ktx = "androidx.room:room-ktx:$versions.room"
+room.paging = "androidx.room:room-paging:$versions.room"
 room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
 room.testing = "androidx.room:room-testing:$versions.room"
 deps.room = room

GithubBrowserSample/app/build.gradle

@@ -15,7 +15,6 @@
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'jacoco'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
@@ -65,10 +64,6 @@ android {
     }
 }
 
-jacoco {
-    toolVersion = "0.7.4+"
-}
-
 dependencies {
     implementation deps.app_compat
     implementation deps.recyclerview

GithubBrowserSample/gradle/wrapper/gradle-wrapper.properties

@@ -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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

GithubBrowserSample/versions.gradle

@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
 versions.apache_commons = "2.5"
 versions.appcompat = "1.2.0-alpha02"
 versions.arch_core = "2.1.0"
-versions.atsl_core = "1.2.0"
-versions.atsl_junit = "1.1.1"
-versions.atsl_rules = "1.2.0"
-versions.atsl_runner = "1.2.0"
+versions.atsl_core = "1.3.0"
+versions.atsl_junit = "1.1.2"
+versions.atsl_rules = "1.3.0"
+versions.atsl_runner = "1.3.0"
 versions.benchmark = "1.1.0-alpha01"
 versions.cardview = "1.0.0"
 versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.2.0"
-versions.fragment = "1.2.1"
+versions.fragment = "1.2.0"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.1.0-alpha04"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
-versions.room = "2.3.0-alpha01"
+versions.room = "2.4.0-alpha05"
 versions.rx_android = "2.0.1"
 versions.rxjava2 = "2.1.3"
 versions.timber = "4.7.1"
 versions.transition = "1.3.0"
 versions.truth = "1.0.1"
-versions.work = "2.2.0"
+versions.work = "2.6.0"
 ext.versions = versions
 
 def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
 def atsl = [:]
 atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"
 deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"
 room.compiler = "androidx.room:room-compiler:$versions.room"
 room.ktx = "androidx.room:room-ktx:$versions.room"
+room.paging = "androidx.room:room-paging:$versions.room"
 room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
 room.testing = "androidx.room:room-testing:$versions.room"
 deps.room = room

LiveDataSample/gradle/wrapper/gradle-wrapper.properties

@@ -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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

LiveDataSample/versions.gradle

@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
 versions.apache_commons = "2.5"
 versions.appcompat = "1.2.0-alpha02"
 versions.arch_core = "2.1.0"
-versions.atsl_core = "1.2.0"
-versions.atsl_junit = "1.1.1"
-versions.atsl_rules = "1.2.0"
-versions.atsl_runner = "1.2.0"
+versions.atsl_core = "1.3.0"
+versions.atsl_junit = "1.1.2"
+versions.atsl_rules = "1.3.0"
+versions.atsl_runner = "1.3.0"
 versions.benchmark = "1.1.0-alpha01"
 versions.cardview = "1.0.0"
 versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.2.0"
-versions.fragment = "1.2.1"
+versions.fragment = "1.2.0"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.1.0-alpha04"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
-versions.room = "2.3.0-alpha01"
+versions.room = "2.4.0-alpha05"
 versions.rx_android = "2.0.1"
 versions.rxjava2 = "2.1.3"
 versions.timber = "4.7.1"
 versions.transition = "1.3.0"
 versions.truth = "1.0.1"
-versions.work = "2.2.0"
+versions.work = "2.6.0"
 ext.versions = versions
 
 def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
 def atsl = [:]
 atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
+atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"
 deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"
 room.compiler = "androidx.room:room-compiler:$versions.room"
 room.ktx = "androidx.room:room-ktx:$versions.room"
+room.paging = "androidx.room:room-paging:$versions.room"
 room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
 room.testing = "androidx.room:room-testing:$versions.room"
 deps.room = room

MADSkillsNavigationSample/gradle/wrapper/gradle-wrapper.properties

@@ -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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip