diff --git a/emoji-facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt b/emoji-facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt index da189de989..5f7a355ab3 100644 --- a/emoji-facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt +++ b/emoji-facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class FacebookEmoji internal constructor( override val unicode: String, diff --git a/emoji-google-compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt b/emoji-google-compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt index dd3d67d2dc..2c2f6000da 100644 --- a/emoji-google-compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt +++ b/emoji-google-compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class GoogleCompatEmoji internal constructor( override val unicode: String, diff --git a/emoji-google/src/androidMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt b/emoji-google/src/androidMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt index 4bebe17379..2a362cd1ef 100644 --- a/emoji-google/src/androidMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt +++ b/emoji-google/src/androidMain/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class GoogleEmoji internal constructor( override val unicode: String, diff --git a/emoji-ios/src/androidMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt b/emoji-ios/src/androidMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt index 9d07d34971..420ca66741 100644 --- a/emoji-ios/src/androidMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt +++ b/emoji-ios/src/androidMain/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class IosEmoji internal constructor( override val unicode: String, diff --git a/emoji-twitter/src/androidMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt b/emoji-twitter/src/androidMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt index 27fd03581f..065a8ae61c 100644 --- a/emoji-twitter/src/androidMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt +++ b/emoji-twitter/src/androidMain/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class TwitterEmoji internal constructor( override val unicode: String, diff --git a/emoji/src/androidMain/kotlin/com/vanniktech/emoji/commonParcelableAndroidApi.kt b/emoji/src/androidMain/kotlin/com/vanniktech/emoji/commonParcelableAndroidApi.kt index b1d592b515..697b4c1e5f 100644 --- a/emoji/src/androidMain/kotlin/com/vanniktech/emoji/commonParcelableAndroidApi.kt +++ b/emoji/src/androidMain/kotlin/com/vanniktech/emoji/commonParcelableAndroidApi.kt @@ -2,3 +2,4 @@ package com.vanniktech.emoji actual typealias Parcelable = android.os.Parcelable actual typealias Parcelize = kotlinx.parcelize.Parcelize +actual typealias IgnoredOnParcel = kotlinx.parcelize.IgnoredOnParcel diff --git a/emoji/src/androidTest/kotlin/com/vanniktech/emoji/TestEmoji.kt b/emoji/src/androidTest/kotlin/com/vanniktech/emoji/TestEmoji.kt index 15d94cf150..82ffd17126 100644 --- a/emoji/src/androidTest/kotlin/com/vanniktech/emoji/TestEmoji.kt +++ b/emoji/src/androidTest/kotlin/com/vanniktech/emoji/TestEmoji.kt @@ -1,7 +1,5 @@ package com.vanniktech.emoji -import kotlinx.parcelize.IgnoredOnParcel - @Parcelize data class TestEmoji( override val unicode: String, override val shortcodes: List, diff --git a/emoji/src/androidMain/kotlin/com/vanniktech/emoji/Emoji.kt b/emoji/src/commonMain/kotlin/com/vanniktech/emoji/Emoji.kt similarity index 100% rename from emoji/src/androidMain/kotlin/com/vanniktech/emoji/Emoji.kt rename to emoji/src/commonMain/kotlin/com/vanniktech/emoji/Emoji.kt diff --git a/emoji/src/commonMain/kotlin/com/vanniktech/emoji/commonParcelableApi.kt b/emoji/src/commonMain/kotlin/com/vanniktech/emoji/commonParcelableApi.kt index 12d520720b..48864438c9 100644 --- a/emoji/src/commonMain/kotlin/com/vanniktech/emoji/commonParcelableApi.kt +++ b/emoji/src/commonMain/kotlin/com/vanniktech/emoji/commonParcelableApi.kt @@ -7,3 +7,9 @@ expect interface Parcelable @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.BINARY) expect annotation class Parcelize() + +@OptIn(ExperimentalMultiplatform::class) +@OptionalExpectation +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.BINARY) +expect annotation class IgnoredOnParcel() diff --git a/generator/template/Emoji.kt b/generator/template/Emoji.kt index f12065e3dc..6681dec3cd 100644 --- a/generator/template/Emoji.kt +++ b/generator/template/Emoji.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class <%= name %> internal constructor( override val unicode: String, diff --git a/generator/template/EmojiCompat.kt b/generator/template/EmojiCompat.kt index 2e866be117..458c2630bb 100644 --- a/generator/template/EmojiCompat.kt +++ b/generator/template/EmojiCompat.kt @@ -17,9 +17,9 @@ 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 -import kotlinx.parcelize.IgnoredOnParcel @Parcelize internal class <%= name %> internal constructor( override val unicode: String,