diff --git a/emoji-facebook/src/commonMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt b/emoji-facebook/src/commonMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt index dcd93afea4..62872c1fdf 100644 --- a/emoji-facebook/src/commonMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt +++ b/emoji-facebook/src/commonMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt @@ -18,10 +18,8 @@ package com.vanniktech.emoji.facebook import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class FacebookEmoji internal constructor( +internal class FacebookEmoji internal constructor( override val unicode: String, override val shortcodes: List, internal val x: Int, @@ -29,7 +27,7 @@ import com.vanniktech.emoji.Parcelize override val isDuplicate: Boolean, override val variants: List = emptyList(), private var parent: FacebookEmoji? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) { diff --git a/emoji-google-compat/src/commonMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt b/emoji-google-compat/src/commonMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt index 780e6308f6..20bd6c617f 100644 --- a/emoji-google-compat/src/commonMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt +++ b/emoji-google-compat/src/commonMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt @@ -18,16 +18,14 @@ package com.vanniktech.emoji.googlecompat import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class GoogleCompatEmoji internal constructor( +internal class GoogleCompatEmoji internal constructor( override val unicode: String, override val shortcodes: List, override val isDuplicate: Boolean, override val variants: List = emptyList(), private var parent: GoogleCompatEmoji? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) { diff --git a/emoji-google/src/commonMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt b/emoji-google/src/commonMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt index b9e8161432..fd568afdae 100644 --- a/emoji-google/src/commonMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt +++ b/emoji-google/src/commonMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt @@ -18,10 +18,8 @@ package com.vanniktech.emoji.google import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class GoogleEmoji internal constructor( +internal class GoogleEmoji internal constructor( override val unicode: String, override val shortcodes: List, internal val x: Int, @@ -29,7 +27,7 @@ import com.vanniktech.emoji.Parcelize override val isDuplicate: Boolean, override val variants: List = emptyList(), private var parent: GoogleEmoji? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) { diff --git a/emoji-ios/src/commonMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt b/emoji-ios/src/commonMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt index f1b5faa4fc..c54b5c6bc1 100644 --- a/emoji-ios/src/commonMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt +++ b/emoji-ios/src/commonMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt @@ -18,10 +18,8 @@ package com.vanniktech.emoji.ios import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class IosEmoji internal constructor( +internal class IosEmoji internal constructor( override val unicode: String, override val shortcodes: List, internal val x: Int, @@ -29,7 +27,7 @@ import com.vanniktech.emoji.Parcelize override val isDuplicate: Boolean, override val variants: List = emptyList(), private var parent: IosEmoji? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) { diff --git a/emoji-twitter/src/commonMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt b/emoji-twitter/src/commonMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt index 8fe71bb592..e202ab26a4 100644 --- a/emoji-twitter/src/commonMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt +++ b/emoji-twitter/src/commonMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt @@ -18,10 +18,8 @@ package com.vanniktech.emoji.twitter import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class TwitterEmoji internal constructor( +internal class TwitterEmoji internal constructor( override val unicode: String, override val shortcodes: List, internal val x: Int, @@ -29,7 +27,7 @@ import com.vanniktech.emoji.Parcelize override val isDuplicate: Boolean, override val variants: List = emptyList(), private var parent: TwitterEmoji? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) { diff --git a/emoji/src/commonMain/kotlin/com/vanniktech/emoji/Emoji.kt b/emoji/src/commonMain/kotlin/com/vanniktech/emoji/Emoji.kt index 8299e8102c..9633e2cd74 100644 --- a/emoji/src/commonMain/kotlin/com/vanniktech/emoji/Emoji.kt +++ b/emoji/src/commonMain/kotlin/com/vanniktech/emoji/Emoji.kt @@ -16,7 +16,7 @@ package com.vanniktech.emoji -interface Emoji : Parcelable { +interface Emoji { val base: Emoji val unicode: String val shortcodes: List diff --git a/generator/template/Emoji.kt b/generator/template/Emoji.kt index a833455fe5..68bf5f7694 100644 --- a/generator/template/Emoji.kt +++ b/generator/template/Emoji.kt @@ -18,10 +18,8 @@ package com.vanniktech.emoji.<%= package %> import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class <%= name %> internal constructor( +internal class <%= name %> internal constructor( override val unicode: String, override val shortcodes: List, internal val x: Int, @@ -29,7 +27,7 @@ import com.vanniktech.emoji.Parcelize override val isDuplicate: Boolean, override val variants: List<<%= name %>> = emptyList(), private var parent: <%= name %>? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) { diff --git a/generator/template/EmojiCompat.kt b/generator/template/EmojiCompat.kt index e2293f056e..95eebe0caf 100644 --- a/generator/template/EmojiCompat.kt +++ b/generator/template/EmojiCompat.kt @@ -18,16 +18,14 @@ package com.vanniktech.emoji.<%= package %> import com.vanniktech.emoji.Emoji import com.vanniktech.emoji.IgnoredOnParcel -import com.vanniktech.emoji.Parcelable -import com.vanniktech.emoji.Parcelize -@Parcelize internal class <%= name %> internal constructor( +internal class <%= name %> internal constructor( override val unicode: String, override val shortcodes: List, override val isDuplicate: Boolean, override val variants: List<<%= name %>> = emptyList(), private var parent: <%= name %>? = null, -) : Emoji, Parcelable { +) : Emoji { @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) { var result = this while (result.parent != null) {