Merge "Remove outdated OptIn annotations" into androidx-main

6 files changed, 0 insertions, 9 deletions

diff --git a/compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/compose/ui/test/junit4/android/ComposeRootRegistry.android.kt b/compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/compose/ui/test/junit4/android/ComposeRootRegistry.android.kt
index f60a5987203..154b77fbd92 100644
--- a/compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/compose/ui/test/junit4/android/ComposeRootRegistry.android.kt
+++ b/compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/compose/ui/test/junit4/android/ComposeRootRegistry.android.kt
@@ -33,7 +33,6 @@ import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.coroutines.resume
-import kotlin.time.ExperimentalTime
 
 /**
  * Registry where all views implementing [ViewRootForTest] should be registered while they
@@ -290,7 +289,6 @@ internal fun ComposeRootRegistry.waitForComposeRoots(atLeastOneRootExpected: Boo
     }
 }
 
-@OptIn(ExperimentalTime::class)
 internal suspend fun ComposeRootRegistry.awaitComposeRoots() {
     ensureComposeRootRegistryIsSetUp()
 
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt
index 9c7e9af375a..292e6dec15c 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt
@@ -332,7 +332,6 @@ private val ShadowSaver = Saver<Shadow, Any>(
 internal val Color.Companion.Saver: Saver<Color, Any>
     get() = ColorSaver
 
-@OptIn(ExperimentalUnsignedTypes::class)
 private val ColorSaver = Saver<Color, Any>(
     save = { it.value },
     restore = { Color(it as ULong) }
diff --git a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Dp.kt b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Dp.kt
index 9e8cd3b60e9..3670a6d23ec 100644
--- a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Dp.kt
+++ b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Dp.kt
@@ -257,7 +257,6 @@ fun DpOffset(x: Dp, y: Dp): DpOffset = DpOffset(packFloats(x.value, y.value))
 /**
  * A two-dimensional offset using [Dp] for units
  */
-@OptIn(ExperimentalUnsignedTypes::class)
 @Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING")
 @Immutable
 inline class DpOffset internal constructor(@PublishedApi internal val packedValue: Long) {
@@ -331,7 +330,6 @@ fun DpSize(width: Dp, height: Dp): DpSize = DpSize(packFloats(width.value, heigh
 /**
  * A two-dimensional Size using [Dp] for units
  */
-@OptIn(ExperimentalUnsignedTypes::class)
 @Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING")
 @Immutable
 inline class DpSize internal constructor(@PublishedApi internal val packedValue: Long) {
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidClipboardManager.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidClipboardManager.android.kt
index cc70283bcb2..26de241f8d0 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidClipboardManager.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidClipboardManager.android.kt
@@ -194,7 +194,6 @@ internal class EncodeHelper {
         }
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     fun encode(color: Color) {
         encode(color.value)
     }
@@ -369,7 +368,6 @@ internal class DecodeHelper(string: String) {
         return mutableSpanStyle.toSpanStyle()
     }
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     fun decodeColor(): Color {
         return Color(decodeULong())
     }
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/TransformOrigin.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/TransformOrigin.kt
index 183af16c5c4..464965d62fa 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/TransformOrigin.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/TransformOrigin.kt
@@ -33,7 +33,6 @@ fun TransformOrigin(pivotFractionX: Float, pivotFractionY: Float): TransformOrig
  * A two-dimensional position represented as a fraction of the Layer's width and height
  */
 @Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING")
-@OptIn(ExperimentalUnsignedTypes::class)
 @Immutable
 inline class TransformOrigin internal constructor(@PublishedApi internal val packedValue: Long) {
 
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/SkiaLayer.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/SkiaLayer.desktop.kt
index f4d08fc4a1b..0824071a467 100644
--- a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/SkiaLayer.desktop.kt
+++ b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/SkiaLayer.desktop.kt
@@ -277,7 +277,6 @@ internal class SkiaLayer(
 
     override fun updateDisplayList() = Unit
 
-    @OptIn(ExperimentalUnsignedTypes::class)
     fun drawShadow(canvas: Canvas) = with(density) {
         val path = when (val outline = outlineCache.outline) {
             is Outline.Rectangle -> Path().apply { addRect(outline.rect) }