Parcelize: Use @Parcelize annotations from Android Extensions instead of the copied&deprecated ones (KT-42342, KT-43150)

Dex can't merge class files from both android-extensions-runtime and parcelize-runtime, so we have to keep only one copy of each class. Instead of @Deprecated annotations, there are new diagnostics (without quick-fixes yet). The goal is to allow simple usages (@Parcelize alone) but forbid kotlinx.android.synthetic.Parceler usage.
2020-11-07 02:01:10 +09:00
parent fa42a6ba58
commit e83a3c3f27
36 changed files with 182 additions and 629 deletions
@@ -1,38 +0,0 @@
-// IGNORE_BACKEND: JVM
-// See KT-38105
-// Throws IllegalAccessError, since the code tries to access the private companion field directly from the generated User$Creator class.
-// WITH_RUNTIME
-
-@file:JvmName("TestKt")
-package test
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-data class User(val name: String, val age: Int)
-
-@Parcelize
-data class UserParcelable(val user: User) : Parcelable {
-    private companion object : Parceler<UserParcelable> {
-        override fun UserParcelable.write(parcel: Parcel, flags: Int) {
-            parcel.writeString(user.name)
-        }
-
-        override fun create(parcel: Parcel) = UserParcelable(User(parcel.readString(), 0))
-    }
-}
-
-fun box() = parcelTest { parcel ->
-    val userParcelable = UserParcelable(User("John", 20))
-    userParcelable.writeToParcel(parcel, 0)
-
-    val bytes = parcel.marshall()
-    parcel.unmarshall(bytes, 0, bytes.size)
-    parcel.setDataPosition(0)
-
-    val userParcelable2 = readFromParcel<UserParcelable>(parcel)
-
-    assert(userParcelable.user.name == userParcelable2.user.name)
-    assert(userParcelable2.user.age == 0)
-}
@@ -1,49 +0,0 @@
-// WITH_RUNTIME
-
-@file:JvmName("TestKt")
-package test
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-object Parceler1 : Parceler<String> {
-    override fun create(parcel: Parcel) = parcel.readInt().toString()
-
-    override fun String.write(parcel: Parcel, flags: Int) {
-        parcel.writeInt(length)
-    }
-}
-
-typealias Parceler2 = Parceler1
-
-object Parceler3 : Parceler<String> {
-    override fun create(parcel: Parcel) = parcel.readString().toUpperCase()
-
-    override fun String.write(parcel: Parcel, flags: Int) {
-        parcel.writeString(this)
-    }
-}
-
-@Parcelize
-@TypeParceler<String, Parceler2>
-data class Test(
-        val a: String,
-        @TypeParceler<String, Parceler1> val b: String,
-        @TypeParceler<String, Parceler3> val c: CharSequence,
-        val d: @WriteWith<Parceler3> String
-) : Parcelable
-
-fun box() = parcelTest { parcel ->
-    val test = Test("Abc", "Abc", "Abc", "Abc")
-    test.writeToParcel(parcel, 0)
-
-    val bytes = parcel.marshall()
-    parcel.unmarshall(bytes, 0, bytes.size)
-    parcel.setDataPosition(0)
-
-    val test2 = readFromParcel<Test>(parcel)
-
-    assert(test.a == "Abc" && test.b == "Abc" && test.c == "Abc" && test.d == "Abc")
-    assert(test2.a == "3" && test2.b == "3" && test2.c == "Abc" && test2.d == "ABC")
-}
@@ -1,55 +0,0 @@
-// IGNORE_BACKEND: JVM
-// See KT-38107
-// The JVM backend is missing support for custom parcelers in List<String>
-// WITH_RUNTIME
-
-@file:JvmName("TestKt")
-package test
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-object Parceler1 : Parceler<String> {
-    override fun create(parcel: Parcel) = parcel.readInt().toString()
-
-    override fun String.write(parcel: Parcel, flags: Int) {
-        parcel.writeInt(length)
-    }
-}
-
-object Parceler2 : Parceler<List<String>> {
-    override fun create(parcel: Parcel) = listOf(parcel.readString())
-
-    override fun List<String>.write(parcel: Parcel, flags: Int) {
-        parcel.writeString(this.joinToString(","))
-    }
-}
-
-@Parcelize
-data class Test(
-        val a: String,
-        val b: @WriteWith<Parceler1> String,
-        val c: List<@WriteWith<Parceler1> String>,
-        val d: @WriteWith<Parceler2> List<String>,
-        val e: @WriteWith<Parceler2> List<@WriteWith<Parceler1> String>
-) : Parcelable
-
-fun box() = parcelTest { parcel ->
-    val test = Test("Abc", "Abc", listOf("A", "bc"), listOf("A", "bc"), listOf("A", "bc"))
-    test.writeToParcel(parcel, 0)
-
-    val bytes = parcel.marshall()
-    parcel.unmarshall(bytes, 0, bytes.size)
-    parcel.setDataPosition(0)
-
-    val test2 = readFromParcel<Test>(parcel)
-
-    with (test) {
-        assert(a == "Abc" && b == "Abc" && c == listOf("A", "bc") && d == listOf("A", "bc") && e == listOf("A", "bc"))
-    }
-
-    with (test2) {
-        assert(a == "Abc" && b == "3" && c == listOf("1", "2") && d == listOf("A,bc") && e == listOf("A,bc"))
-    }
-}
@@ -1,117 +0,0 @@
-final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
-    private void <init>()
-
-    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker)
-
-    public User create(android.os.Parcel parcel)
-
-    public java.lang.Object create(android.os.Parcel parcel)
-
-    public User[] newArray(int size) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          CHECKCAST
-          ILOAD (1)
-          INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
-          CHECKCAST
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int size) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public void write(User $this$write, android.os.Parcel parcel, int flags)
-
-    public void write(java.lang.Object $this$write, android.os.Parcel parcel, int flags)
-}
-
-public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator {
-    public void <init>()
-
-    public final User createFromParcel(android.os.Parcel parcel) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (parcel)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          INVOKESTATIC (User, access$getCompanion$p$s2645995, ()LUser$Companion;)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object createFromParcel(android.os.Parcel source) {
-        LABEL (L0)
-          ALOAD (0)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public final User[] newArray(int size) {
-        LABEL (L0)
-          ILOAD (1)
-          ANEWARRAY
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int size) {
-        LABEL (L0)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-}
-
-public final class User : java/lang/Object, android/os/Parcelable {
-    public final static android.os.Parcelable$Creator CREATOR
-
-    private final static User$Companion Companion
-
-    private final int age
-
-    private final java.lang.String firstName
-
-    private final java.lang.String lastName
-
-    static void <clinit>()
-
-    public void <init>(java.lang.String firstName, java.lang.String lastName, int age)
-
-    public final static User$Companion access$getCompanion$p$s2645995()
-
-    public int describeContents()
-
-    public final int getAge()
-
-    public final java.lang.String getFirstName()
-
-    public final java.lang.String getLastName()
-
-    public void writeToParcel(android.os.Parcel out, int flags) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (out)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
-          ALOAD (0)
-          ALOAD (1)
-          ILOAD (2)
-          INVOKEVIRTUAL (User$Companion, write, (LUser;Landroid/os/Parcel;I)V)
-          RETURN
-        LABEL (L1)
-    }
-}
@@ -1,19 +0,0 @@
-// CURIOUS_ABOUT writeToParcel, createFromParcel, newArray
-// WITH_RUNTIME
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-@Parcelize
-class User(val firstName: String, val lastName: String, val age: Int) : Parcelable {
-    private companion object : Parceler<User> {
-        override fun User.write(parcel: Parcel, flags: Int) {
-            parcel.writeString(firstName)
-            parcel.writeString(lastName)
-            parcel.writeInt(age)
-        }
-
-        override fun create(parcel: Parcel) = User(parcel.readString(), parcel.readString(), parcel.readInt())
-    }
-}
@@ -1,113 +0,0 @@
-final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
-    private void <init>()
-
-    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker)
-
-    public User create(android.os.Parcel parcel)
-
-    public java.lang.Object create(android.os.Parcel p0)
-
-    public User[] newArray(int size) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
-          CHECKCAST
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int p0) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
-          ARETURN
-    }
-
-    public void write(User $this$write, android.os.Parcel parcel, int flags)
-
-    public void write(java.lang.Object p0, android.os.Parcel p1, int p2)
-}
-
-public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator {
-    public void <init>()
-
-    public final User createFromParcel(android.os.Parcel in) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (in)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object createFromParcel(android.os.Parcel p0) {
-        LABEL (L0)
-        LINENUMBER (9)
-          ALOAD (0)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-    }
-
-    public final User[] newArray(int size) {
-        LABEL (L0)
-          ILOAD (1)
-          ANEWARRAY
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int p0) {
-        LABEL (L0)
-        LINENUMBER (9)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;)
-          ARETURN
-    }
-}
-
-public final class User : java/lang/Object, android/os/Parcelable {
-    public final static android.os.Parcelable$Creator CREATOR
-
-    private final static User$Companion Companion
-
-    private final int age
-
-    private final java.lang.String firstName
-
-    private final java.lang.String lastName
-
-    static void <clinit>()
-
-    public void <init>(java.lang.String firstName, java.lang.String lastName, int age)
-
-    public int describeContents()
-
-    public final int getAge()
-
-    public final java.lang.String getFirstName()
-
-    public final java.lang.String getLastName()
-
-    public void writeToParcel(android.os.Parcel parcel, int flags) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (parcel)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
-          ALOAD (0)
-          ALOAD (1)
-          ILOAD (2)
-          INVOKEVIRTUAL (User$Companion, write, (LUser;Landroid/os/Parcel;I)V)
-          RETURN
-        LABEL (L1)
-    }
-}