Revert a WA - Fix ArrayIndexOutOfBoundsException on iOS and Wasm (#1679)

The WA was introduced in #1548 Since we redirect to collections of 1.5.0-alpha version, we don't need the workaround anymore
JetBrains · Nov 5, 2024 · 574272b · 574272b
1 parent 335f2fc
commit 574272b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/...ion/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimationSpec.kt b/...ion/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimationSpec.kt
@@ -658,9 +658,7 @@ public class KeyframesSpec<T>(public val config: KeyframesSpecConfig<T>) :
             timestamps.add(config.durationMillis)
         }
 
-        //the reason is https://youtrack.jetbrains.com/issue/KT-70005
-        //it was fixed in androidx.collection:collection:1.5.0-alpha01, but we redirect on 1.4.0 yet
-        if (timestamps.isNotEmpty()) timestamps.sort()
+        timestamps.sort()
 
         return VectorizedKeyframesSpec(
             timestamps = timestamps,
@@ -775,9 +773,7 @@ public class KeyframesWithSplineSpec<T>(
             timestamps.add(config.durationMillis)
         }
 
-        //the reason is https://youtrack.jetbrains.com/issue/KT-70005
-        //it was fixed in androidx.collection:collection:1.5.0-alpha01, but we redirect on 1.4.0 yet
-        if (timestamps.isNotEmpty()) timestamps.sort()
+        timestamps.sort()
         return VectorizedMonoSplineKeyframesSpec(
             timestamps = timestamps,
             keyframes = timeToVectorMap,

diff --git a/...ion-core/src/commonMain/kotlin/androidx/compose/animation/core/VectorizedAnimationSpec.kt b/...ion-core/src/commonMain/kotlin/androidx/compose/animation/core/VectorizedAnimationSpec.kt
@@ -251,9 +251,7 @@ internal constructor(
                     times.add(durationMillis)
                 }
 
-                //the reason is https://youtrack.jetbrains.com/issue/KT-70005
-                //it was fixed in androidx.collection:collection:1.5.0-alpha01, but we redirect on 1.4.0 yet
-                if (times.isNotEmpty()) times.sort()
+                times.sort()
                 return@run times
             },
         keyframes =

diff --git a/...ut/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneExpansionState.kt b/...ut/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneExpansionState.kt
@@ -588,9 +588,7 @@ private fun List<PaneExpansionAnchor>.toPositions(
     forEachIndexed { index, anchor ->
         anchors.add(IndexedAnchorPosition(anchor.positionIn(maxExpansionWidth, density), index))
     }
-    //the reason is https://youtrack.jetbrains.com/issue/KT-70005
-    //it was fixed in androidx.collection:collection:1.5.0-alpha01, but we redirect on 1.4.0 yet
-    if (!anchors.isEmpty()) anchors.sort()
+    anchors.sort()
     return anchors
 }