Merge branch 'v1.10-release'

* v1.10-release: Finish releasing v1.10.0-beta03 Releasing v1.10.0-beta03 Fixes bad readSparseArray call in WorkflowLayout
square · Mar 16, 2023 · 321ad71 · 321ad71
2 parents c84b4d7 + 7600ba4
commit 321ad71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ android.useAndroidX=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=com.squareup.workflow1
-VERSION_NAME=1.10.0-beta03-SNAPSHOT
+VERSION_NAME=1.10.0-beta04-SNAPSHOT
 
 POM_DESCRIPTION=Square Workflow
 

diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt
@@ -252,7 +252,7 @@ public class WorkflowLayout(
 
     constructor(source: Parcel) : super(source) {
       this.childState = if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
-        source.readSparseArray(SavedState::class.java.classLoader, SavedState::class.java)!!
+        source.readSparseArray(SavedState::class.java.classLoader, Parcelable::class.java)!!
       } else {
         @Suppress("DEPRECATION")
         source.readSparseArray(SavedState::class.java.classLoader)!!

diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateFrame.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateFrame.kt
@@ -32,10 +32,7 @@ internal data class ViewStateFrame(
     override fun createFromParcel(parcel: Parcel): ViewStateFrame {
       val key = parcel.readString()!!
       val viewState = if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
-        parcel.readSparseArray<Parcelable>(
-          ViewStateFrame::class.java.classLoader,
-          Parcelable::class.java
-        )!!
+        parcel.readSparseArray(ViewStateFrame::class.java.classLoader, Parcelable::class.java)!!
       } else {
         @Suppress("DEPRECATION")
         parcel.readSparseArray<Parcelable>(ViewStateFrame::class.java.classLoader)!!