Skip to content

Commit a56cf20

Browse files
gaobohaokugaobohaoku
authored
Merge pull request #2 from android/main
Pull
2 parents 5bd470e + 1c8fc23 commit a56cf20

File tree

136 files changed

+3336
-1230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+3336
-1230
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ workflows:
131131
- test_navigation_basic_sample
132132
- test_navigation_advanced_sample
133133
- test_paging_sample
134-
# flaky, deprecated - test_paging_network_sample
134+
- test_paging_network_sample
135135
- test_persistence_content_provider_sample
136136
# inst tests with flavors - test_persistence_migrations_sample
137137
# temporarily disabled due to #804 - test_workmanager_sample

‎BasicRxJavaSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎BasicRxJavaSample/versions.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
2727
versions.apache_commons = "2.5"
2828
versions.appcompat = "1.2.0-alpha02"
2929
versions.arch_core = "2.1.0"
30-
versions.atsl_core = "1.2.0"
31-
versions.atsl_junit = "1.1.1"
32-
versions.atsl_rules = "1.2.0"
33-
versions.atsl_runner = "1.2.0"
30+
versions.atsl_core = "1.3.0"
31+
versions.atsl_junit = "1.1.2"
32+
versions.atsl_rules = "1.3.0"
33+
versions.atsl_runner = "1.3.0"
3434
versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
42-
versions.fragment = "1.2.1"
42+
versions.fragment = "1.2.0"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
5252
versions.mockwebserver = "3.8.1"
5353
versions.navigation = "2.3.0-alpha01"
5454
versions.okhttp_logging_interceptor = "3.9.0"
55-
versions.paging = "3.0.0-alpha11"
55+
versions.paging = "3.1.0-alpha04"
5656
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
59-
versions.room = "2.3.0-alpha01"
59+
versions.room = "2.4.0-alpha05"
6060
versions.rx_android = "2.0.1"
6161
versions.rxjava2 = "2.1.3"
6262
versions.timber = "4.7.1"
6363
versions.transition = "1.3.0"
6464
versions.truth = "1.0.1"
65-
versions.work = "2.2.0"
65+
versions.work = "2.6.0"
6666
ext.versions = versions
6767

6868
def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
9292
def atsl = [:]
9393
atsl.core = "androidx.test:core:$versions.atsl_core"
9494
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
95+
atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
9596
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
9697
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
9798
deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
195196
room.runtime = "androidx.room:room-runtime:$versions.room"
196197
room.compiler = "androidx.room:room-compiler:$versions.room"
197198
room.ktx = "androidx.room:room-ktx:$versions.room"
199+
room.paging = "androidx.room:room-paging:$versions.room"
198200
room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
199201
room.testing = "androidx.room:room-testing:$versions.room"
200202
deps.room = room

‎BasicRxJavaSampleKotlin/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎BasicRxJavaSampleKotlin/versions.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
2727
versions.apache_commons = "2.5"
2828
versions.appcompat = "1.2.0-alpha02"
2929
versions.arch_core = "2.1.0"
30-
versions.atsl_core = "1.2.0"
31-
versions.atsl_junit = "1.1.1"
32-
versions.atsl_rules = "1.2.0"
33-
versions.atsl_runner = "1.2.0"
30+
versions.atsl_core = "1.3.0"
31+
versions.atsl_junit = "1.1.2"
32+
versions.atsl_rules = "1.3.0"
33+
versions.atsl_runner = "1.3.0"
3434
versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
42-
versions.fragment = "1.2.1"
42+
versions.fragment = "1.2.0"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
5252
versions.mockwebserver = "3.8.1"
5353
versions.navigation = "2.3.0-alpha01"
5454
versions.okhttp_logging_interceptor = "3.9.0"
55-
versions.paging = "3.0.0-alpha11"
55+
versions.paging = "3.1.0-alpha04"
5656
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
59-
versions.room = "2.3.0-alpha01"
59+
versions.room = "2.4.0-alpha05"
6060
versions.rx_android = "2.0.1"
6161
versions.rxjava2 = "2.1.3"
6262
versions.timber = "4.7.1"
6363
versions.transition = "1.3.0"
6464
versions.truth = "1.0.1"
65-
versions.work = "2.2.0"
65+
versions.work = "2.6.0"
6666
ext.versions = versions
6767

6868
def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
9292
def atsl = [:]
9393
atsl.core = "androidx.test:core:$versions.atsl_core"
9494
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
95+
atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
9596
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
9697
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
9798
deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
195196
room.runtime = "androidx.room:room-runtime:$versions.room"
196197
room.compiler = "androidx.room:room-compiler:$versions.room"
197198
room.ktx = "androidx.room:room-ktx:$versions.room"
199+
room.paging = "androidx.room:room-paging:$versions.room"
198200
room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
199201
room.testing = "androidx.room:room-testing:$versions.room"
200202
deps.room = room

‎BasicSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎BasicSample/versions.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
2727
versions.apache_commons = "2.5"
2828
versions.appcompat = "1.2.0-alpha02"
2929
versions.arch_core = "2.1.0"
30-
versions.atsl_core = "1.2.0"
31-
versions.atsl_junit = "1.1.1"
32-
versions.atsl_rules = "1.2.0"
33-
versions.atsl_runner = "1.2.0"
30+
versions.atsl_core = "1.3.0"
31+
versions.atsl_junit = "1.1.2"
32+
versions.atsl_rules = "1.3.0"
33+
versions.atsl_runner = "1.3.0"
3434
versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
42-
versions.fragment = "1.2.1"
42+
versions.fragment = "1.2.0"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
5252
versions.mockwebserver = "3.8.1"
5353
versions.navigation = "2.3.0-alpha01"
5454
versions.okhttp_logging_interceptor = "3.9.0"
55-
versions.paging = "3.0.0-alpha11"
55+
versions.paging = "3.1.0-alpha04"
5656
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
59-
versions.room = "2.3.0-alpha01"
59+
versions.room = "2.4.0-alpha05"
6060
versions.rx_android = "2.0.1"
6161
versions.rxjava2 = "2.1.3"
6262
versions.timber = "4.7.1"
6363
versions.transition = "1.3.0"
6464
versions.truth = "1.0.1"
65-
versions.work = "2.2.0"
65+
versions.work = "2.6.0"
6666
ext.versions = versions
6767

6868
def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
9292
def atsl = [:]
9393
atsl.core = "androidx.test:core:$versions.atsl_core"
9494
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
95+
atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
9596
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
9697
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
9798
deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
195196
room.runtime = "androidx.room:room-runtime:$versions.room"
196197
room.compiler = "androidx.room:room-compiler:$versions.room"
197198
room.ktx = "androidx.room:room-ktx:$versions.room"
199+
room.paging = "androidx.room:room-paging:$versions.room"
198200
room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
199201
room.testing = "androidx.room:room-testing:$versions.room"
200202
deps.room = room

‎GithubBrowserSample/app/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
apply plugin: 'com.android.application'
18-
apply plugin: 'jacoco'
1918
apply plugin: 'kotlin-android'
2019
apply plugin: 'kotlin-kapt'
2120

@@ -65,10 +64,6 @@ android {
6564
}
6665
}
6766

68-
jacoco {
69-
toolVersion = "0.7.4+"
70-
}
71-
7267
dependencies {
7368
implementation deps.app_compat
7469
implementation deps.recyclerview

‎GithubBrowserSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎GithubBrowserSample/versions.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
2727
versions.apache_commons = "2.5"
2828
versions.appcompat = "1.2.0-alpha02"
2929
versions.arch_core = "2.1.0"
30-
versions.atsl_core = "1.2.0"
31-
versions.atsl_junit = "1.1.1"
32-
versions.atsl_rules = "1.2.0"
33-
versions.atsl_runner = "1.2.0"
30+
versions.atsl_core = "1.3.0"
31+
versions.atsl_junit = "1.1.2"
32+
versions.atsl_rules = "1.3.0"
33+
versions.atsl_runner = "1.3.0"
3434
versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
42-
versions.fragment = "1.2.1"
42+
versions.fragment = "1.2.0"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
5252
versions.mockwebserver = "3.8.1"
5353
versions.navigation = "2.3.0-alpha01"
5454
versions.okhttp_logging_interceptor = "3.9.0"
55-
versions.paging = "3.0.0-alpha11"
55+
versions.paging = "3.1.0-alpha04"
5656
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
59-
versions.room = "2.3.0-alpha01"
59+
versions.room = "2.4.0-alpha05"
6060
versions.rx_android = "2.0.1"
6161
versions.rxjava2 = "2.1.3"
6262
versions.timber = "4.7.1"
6363
versions.transition = "1.3.0"
6464
versions.truth = "1.0.1"
65-
versions.work = "2.2.0"
65+
versions.work = "2.6.0"
6666
ext.versions = versions
6767

6868
def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
9292
def atsl = [:]
9393
atsl.core = "androidx.test:core:$versions.atsl_core"
9494
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
95+
atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
9596
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
9697
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
9798
deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
195196
room.runtime = "androidx.room:room-runtime:$versions.room"
196197
room.compiler = "androidx.room:room-compiler:$versions.room"
197198
room.ktx = "androidx.room:room-ktx:$versions.room"
199+
room.paging = "androidx.room:room-paging:$versions.room"
198200
room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
199201
room.testing = "androidx.room:room-testing:$versions.room"
200202
deps.room = room

‎LiveDataSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎LiveDataSample/versions.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ versions.annotations = "1.0.0"
2727
versions.apache_commons = "2.5"
2828
versions.appcompat = "1.2.0-alpha02"
2929
versions.arch_core = "2.1.0"
30-
versions.atsl_core = "1.2.0"
31-
versions.atsl_junit = "1.1.1"
32-
versions.atsl_rules = "1.2.0"
33-
versions.atsl_runner = "1.2.0"
30+
versions.atsl_core = "1.3.0"
31+
versions.atsl_junit = "1.1.2"
32+
versions.atsl_rules = "1.3.0"
33+
versions.atsl_runner = "1.3.0"
3434
versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
@@ -39,7 +39,7 @@ versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
42-
versions.fragment = "1.2.1"
42+
versions.fragment = "1.2.0"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
@@ -52,17 +52,17 @@ versions.mockito_android = "2.25.0"
5252
versions.mockwebserver = "3.8.1"
5353
versions.navigation = "2.3.0-alpha01"
5454
versions.okhttp_logging_interceptor = "3.9.0"
55-
versions.paging = "3.0.0-alpha11"
55+
versions.paging = "3.1.0-alpha04"
5656
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
59-
versions.room = "2.3.0-alpha01"
59+
versions.room = "2.4.0-alpha05"
6060
versions.rx_android = "2.0.1"
6161
versions.rxjava2 = "2.1.3"
6262
versions.timber = "4.7.1"
6363
versions.transition = "1.3.0"
6464
versions.truth = "1.0.1"
65-
versions.work = "2.2.0"
65+
versions.work = "2.6.0"
6666
ext.versions = versions
6767

6868
def build_versions = [:]
@@ -92,6 +92,7 @@ deps.arch_core = arch_core
9292
def atsl = [:]
9393
atsl.core = "androidx.test:core:$versions.atsl_core"
9494
atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
95+
atsl.ext_junit_ktx = "androidx.test.ext:junit-ktx:$versions.atsl_junit"
9596
atsl.runner = "androidx.test:runner:$versions.atsl_runner"
9697
atsl.rules = "androidx.test:rules:$versions.atsl_rules"
9798
deps.atsl = atsl
@@ -195,6 +196,7 @@ def room = [:]
195196
room.runtime = "androidx.room:room-runtime:$versions.room"
196197
room.compiler = "androidx.room:room-compiler:$versions.room"
197198
room.ktx = "androidx.room:room-ktx:$versions.room"
199+
room.paging = "androidx.room:room-paging:$versions.room"
198200
room.rxjava2 = "androidx.room:room-rxjava2:$versions.room"
199201
room.testing = "androidx.room:room-testing:$versions.room"
200202
deps.room = room

‎MADSkillsNavigationSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 commit comments

Comments
 (0)