[GH] Only reference AndroidX Annotation's @MainThread in the JVM

veyndan · copybara-github · commit 66b8f1aa5855 · 2023-07-04T16:49:44.000-07:00
Test: ./gradlew test connectedCheck Bug: 270612487 This is an imported pull request from #581. Resolves #581 Github-Pr-Head-Sha: 343eeff GitOrigin-RevId: f4819b7 Change-Id: Ia6a56b6a463b9a2eddbf7ccff4507481bbaf4c54
diff --git a/paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingDataDiffer.kt b/paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingDataDiffer.kt
@@ -17,7 +17,6 @@
 package androidx.paging
 
 import androidx.annotation.IntRange
-import androidx.annotation.MainThread
 import androidx.annotation.RestrictTo
 import androidx.paging.LoadType.APPEND
 import androidx.paging.LoadType.PREPEND
diff --git a/paging/paging-common/src/commonMain/kotlin/androidx/paging/annotation.kt b/paging/paging-common/src/commonMain/kotlin/androidx/paging/annotation.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.paging
+
+public expect annotation class MainThread()
diff --git a/paging/paging-common/src/jvmMain/kotlin/androidx/paging/MainThread.kt b/paging/paging-common/src/jvmMain/kotlin/androidx/paging/MainThread.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.paging
+
+public actual typealias MainThread = androidx.annotation.MainThread
diff --git a/paging/paging-common/src/nativeMain/kotlin/androidx/paging/annotation.kt b/paging/paging-common/src/nativeMain/kotlin/androidx/paging/annotation.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.paging
+
+public actual annotation class MainThread()
