Skip to content

Commit 86cdd11

Browse files
authored
Merge pull request #940 from dlam/dlam/update-paging
Update to paging 3.0.0-alpha11
2 parents 233dd8e + cceaea1 commit 86cdd11

File tree

34 files changed

+74
-81
lines changed

34 files changed

+74
-81
lines changed

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

BasicRxJavaSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

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

BasicRxJavaSampleKotlin/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

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

BasicSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

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

GithubBrowserSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

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

LiveDataSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

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

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

NavigationAdvancedSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

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

NavigationBasicSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

PagingSample/app/src/main/java/paging/android/example/com/pagingsample/MainActivity.kt

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import androidx.lifecycle.lifecycleScope
2525
import androidx.recyclerview.widget.ItemTouchHelper
2626
import androidx.recyclerview.widget.RecyclerView
2727
import kotlinx.android.synthetic.main.activity_main.*
28-
import kotlinx.coroutines.ExperimentalCoroutinesApi
2928
import kotlinx.coroutines.flow.collectLatest
3029
import kotlinx.coroutines.launch
3130

@@ -49,7 +48,6 @@ class MainActivity : AppCompatActivity() {
4948
// Subscribe the adapter to the ViewModel, so the items in the adapter are refreshed
5049
// when the list changes
5150
lifecycleScope.launch {
52-
@OptIn(ExperimentalCoroutinesApi::class)
5351
viewModel.allCheeses.collectLatest { adapter.submitData(it) }
5452
}
5553

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

PagingSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/repository/inDb/DbRedditPostRepository.kt

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.android.example.paging.pagingwithnetwork.reddit.repository.inDb
1818

19+
import androidx.paging.ExperimentalPagingApi
1920
import androidx.paging.Pager
2021
import androidx.paging.PagingConfig
2122
import com.android.example.paging.pagingwithnetwork.reddit.api.RedditApi
@@ -29,6 +30,7 @@ import com.android.example.paging.pagingwithnetwork.reddit.repository.RedditPost
2930
*/
3031
class DbRedditPostRepository(val db: RedditDb, val redditApi: RedditApi) : RedditPostRepository {
3132

33+
@OptIn(ExperimentalPagingApi::class)
3234
override fun postsOfSubreddit(subReddit: String, pageSize: Int) = Pager(
3335
config = PagingConfig(pageSize),
3436
remoteMediator = PageKeyedRemoteMediator(db, redditApi, subReddit)

PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/repository/inMemory/byItem/ItemKeyedSubredditPagingSource.kt

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.android.example.paging.pagingwithnetwork.reddit.repository.inMemory.byItem
1818

19-
import androidx.paging.ExperimentalPagingApi
2019
import androidx.paging.PagingSource
2120
import androidx.paging.PagingSource.LoadParams.Append
2221
import androidx.paging.PagingSource.LoadParams.Prepend
@@ -61,7 +60,6 @@ class ItemKeyedSubredditPagingSource(
6160
}
6261
}
6362

64-
@OptIn(ExperimentalPagingApi::class)
6563
override fun getRefreshKey(state: PagingState<String, RedditPost>): String? {
6664
/**
6765
* The name field is a unique identifier for post items.

PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/ui/RedditActivity.kt

-5
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ import com.android.example.paging.pagingwithnetwork.R
3333
import com.android.example.paging.pagingwithnetwork.reddit.ServiceLocator
3434
import com.android.example.paging.pagingwithnetwork.reddit.repository.RedditPostRepository
3535
import kotlinx.android.synthetic.main.activity_reddit.*
36-
import kotlinx.coroutines.ExperimentalCoroutinesApi
37-
import kotlinx.coroutines.FlowPreview
3836
import kotlinx.coroutines.flow.collect
3937
import kotlinx.coroutines.flow.collectLatest
4038
import kotlinx.coroutines.flow.distinctUntilChangedBy
@@ -91,21 +89,18 @@ class RedditActivity : AppCompatActivity() {
9189
)
9290

9391
lifecycleScope.launchWhenCreated {
94-
@OptIn(ExperimentalCoroutinesApi::class)
9592
adapter.loadStateFlow.collectLatest { loadStates ->
9693
swipe_refresh.isRefreshing = loadStates.refresh is LoadState.Loading
9794
}
9895
}
9996

10097
lifecycleScope.launchWhenCreated {
101-
@OptIn(ExperimentalCoroutinesApi::class)
10298
model.posts.collectLatest {
10399
adapter.submitData(it)
104100
}
105101
}
106102

107103
lifecycleScope.launchWhenCreated {
108-
@OptIn(FlowPreview::class)
109104
adapter.loadStateFlow
110105
// Only emit when REFRESH LoadState for RemoteMediator changes.
111106
.distinctUntilChangedBy { it.refresh }

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

PagingWithNetworkSample/versions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ versions.benchmark = "1.1.0-alpha01"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.coroutines = "1.3.7"
38+
versions.coroutines = "1.4.1"
3939
versions.dagger = "2.16"
4040
versions.dexmaker = "2.2.0"
4141
versions.espresso = "3.2.0"
4242
versions.fragment = "1.2.1"
4343
versions.glide = "4.8.0"
4444
versions.hamcrest = "1.3"
4545
versions.junit = "4.12"
46-
versions.kotlin = "1.3.72"
46+
versions.kotlin = "1.4.21"
4747
versions.lifecycle = "2.2.0"
4848
versions.material = "1.0.0"
4949
versions.mockito = "2.25.0"
@@ -52,8 +52,8 @@ 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-alpha08"
56-
versions.recyclerview = "1.0.0"
55+
versions.paging = "3.0.0-alpha11"
56+
versions.recyclerview = "1.2.0-beta01"
5757
versions.retrofit = "2.9.0"
5858
versions.robolectric = "4.2"
5959
versions.room = "2.3.0-alpha01"

0 commit comments

Comments
 (0)