8000 Move `androidMain` files to `commonMain` · androidx/androidx@6c93a0c · GitHub
[go: up one dir, main page]

Skip to content

Commit 6c93a0c

Browse files
committed
Move androidMain files to commonMain
1 parent 9bbb494 commit 6c93a0c

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

paging/paging-testing/src/androidMain/kotlin/androidx/paging/testing/LoadErrorHandler.kt renamed to paging/paging-testing/src/commonMain/kotlin/androidx/paging/testing/LoadErrorHandler.kt

File renamed without changes.

paging/paging-testing/src/androidMain/kotlin/androidx/paging/testing/PagerFlowSnapshot.kt renamed to paging/paging-testing/src/commonMain/kotlin/androidx/paging/testing/PagerFlowSnapshot.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import androidx.paging.testing.LoaderCallback.CallbackType.ON_CHANGED
3333
import androidx.paging.testing.LoaderCallback.CallbackType.ON_INSERTED
3434
import androidx.paging.testing.LoaderCallback.CallbackType.ON_REMOVED
3535
import kotlin.coroutines.CoroutineContext
36+
import kotlin.jvm.JvmSuppressWildcards
3637
import kotlinx.coroutines.cancelAndJoin
3738
import kotlinx.coroutines.coroutineScope
3839
import kotlinx.coroutines.flow.Flow

paging/paging-testing/src/androidMain/kotlin/androidx/paging/testing/SnapshotLoader.kt renamed to paging/paging-testing/src/commonMain/kotlin/androidx/paging/testing/SnapshotLoader.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ import androidx.paging.PagingData
2525
import androidx.paging.PagingDataDiffer
2626
import androidx.paging.PagingSource
2727
import androidx.paging.testing.LoaderCallback.CallbackType.ON_INSERTED
28-
import java.util.concurrent.atomic.AtomicInteger
29-
import java.util.concurrent.atomic.AtomicReference
28+
import androidx.paging.testing.internal.AtomicInt
29+
import androidx.paging.testing.internal.AtomicRef
30+
import kotlin.jvm.JvmSuppressWildcards
3031
import kotlin.math.abs
3132
import kotlinx.coroutines.flow.MutableStateFlow
3233
import kotlinx.coroutines.flow.filterNotNull
@@ -451,12 +452,12 @@ internal data class Generation(
451452
* Temporarily stores the latest [DifferCallback] to track prepends to the beginning of list.
452453
* Value is reset to null once read.
453454
*/
454-
val callbackState: AtomicReference<LoaderCallback?> = AtomicReference(null),
455+
val callbackState: AtomicRef<LoaderCallback?> = AtomicRef(null),
455456

456457
/**
457458
* Tracks the last accessed(peeked) index on the differ for this generation
458459
*/
459-
var lastAccessedIndex: AtomicInteger = AtomicInteger()
460+
var lastAccessedIndex: AtomicInt = AtomicInt(0)
460461
)
461462

462463
internal data class LoaderCallback(

paging/paging-testing/src/androidMain/kotlin/androidx/paging/testing/StaticListPagingSource.kt renamed to paging/paging-testing/src/commonMain/kotlin/androidx/paging/testing/StaticListPagingSource.kt

File renamed without changes.

paging/paging-testing/src/androidMain/kotlin/androidx/paging/testing/StaticListPagingSourceFactory.kt renamed to paging/paging-testing/src/commonMain/kotlin/androidx/paging/testing/StaticListPagingSourceFactory.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.paging.LoadType.REFRESH
2222
import androidx.paging.Pager
2323
import androidx.paging.PagingSource
2424
import androidx.paging.PagingSourceFactory
25+
import kotlin.jvm.JvmSuppressWildcards
2526
import kotlinx.coroutines.CoroutineScope
2627
import kotlinx.coroutines.flow.Flow
2728
import kotlinx.coroutines.launch

paging/paging-testing/src/androidMain/kotlin/androidx/paging/testing/TestPager.kt renamed to paging/paging-testing/src/commonMain/kotlin/androidx/paging/testing/TestPager.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import androidx.paging.PagingSource.LoadParams
2828
import androidx.paging.PagingSource.LoadResult
2929
import androidx.paging.PagingSource.LoadResult.Page.Companion.COUNT_UNDEFINED
3030
import androidx.paging.PagingState
31-
import java.util.concurrent.atomic.AtomicBoolean
31+
import androidx.paging.testing.internal.AtomicBoolean
32+
import kotlin.jvm.JvmSuppressWildcards
3233
import kotlinx.coroutines.sync.Mutex
3334
import kotlinx.coroutines.sync.withLock
3435

0 commit comments

Comments
 (0)
0