Multiplatform: Move Emoji interface to commonMain. (#799)

vanniktech · May 25, 2022 · b273fb6 · b273fb6
1 parent 03e36dc
commit b273fb6
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 9 deletions.
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
@@ -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/...ogle-compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt b/...ogle-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,5 @@
 package com.vanniktech.emoji
 
-import kotlinx.parcelize.IgnoredOnParcel
-
 @Parcelize data class TestEmoji(
   override val unicode: String,
   override val shortcodes: List<String>,

diff --git a/...Main/kotlin/com/vanniktech/emoji/Emoji.kt → ...Main/kotlin/com/vanniktech/emoji/Emoji.kt b/...Main/kotlin/com/vanniktech/emoji/Emoji.kt → ...Main/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
@@ -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
@@ -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
@@ -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,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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