Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Bump androidx.paging:paging-runtime from 2.1.2 to 3.3.6 #21685

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

build(deps): Bump androidx.paging:paging-runtime from 2.1.2 to 3.3.6 #21685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4538089
build(deps): Bump androidx.paging:paging-runtime from 2.1.2 to 3.3.6
dependabot[bot] Feb 13, 2025
8ab4449
First pass at fixing paging lib update errors
nbradbury Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ androidx-exifinterface = '1.3.7'
androidx-fragment = '1.8.6'
androidx-lifecycle = '2.8.7'
androidx-navigation = '2.8.7'
androidx-paging = '2.1.2'
androidx-paging = '3.3.6'
androidx-percentlayout = '1.0.0'
androidx-preference = '1.2.1'
androidx-recyclerview = '1.3.2'
Expand Down
4 changes: 2 additions & 2 deletions libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSo
*
* @param createDataSource A function that creates an instance of [InternalPagedListDataSource].
*/
class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any>(
private val createDataSource: () -> InternalPagedListDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
) : DataSource.Factory<Int, LIST_ITEM>() {
private var currentSource: PagedListPositionalDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>? = null
Expand All @@ -30,7 +30,7 @@ class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_I
*
* @param dataSource Describes how to take certain actions such as fetching list for the item type [LIST_ITEM].
*/
private class PagedListPositionalDataSource<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
private class PagedListPositionalDataSource<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any>(
private val dataSource: InternalPagedListDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
) : PositionalDataSource<LIST_ITEM>() {
override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<LIST_ITEM>) {
Expand Down
2 changes: 1 addition & 1 deletion libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import kotlin.coroutines.CoroutineContext
* to either let the user know of each error or present the error in the empty view when it's visible.
*/
@Suppress("LongParameterList")
class PagedListWrapper<T>(
class PagedListWrapper<T : Any>(
val data: LiveData<PagedList<T>>,
private val dispatcher: Dispatcher,
private val listDescriptor: ListDescriptor,
Expand Down
2 changes: 1 addition & 1 deletion libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class ListStore @Inject constructor(
/**
* A helper function that creates a [PagedListFactory] for the given [LIST_DESCRIPTOR] and [dataSource].
*/
private fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM> createPagedListFactory(
private fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any> createPagedListFactory(
listDescriptor: LIST_DESCRIPTOR,
dataSource: ListItemDataSourceInterface<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
): PagedListFactory<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM> {
Expand Down