Technical: Use equals without referencing javaClass.

vanniktech · Jun 25, 2024 · 47cacd5 · 47cacd5
1 parent 8c4cc9e
commit 47cacd5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...droidx-emoji2/src/commonMain/kotlin/com/vanniktech/emoji/androidxemoji2/AndroidxEmoji2.kt b/...droidx-emoji2/src/commonMain/kotlin/com/vanniktech/emoji/androidxemoji2/AndroidxEmoji2.kt
@@ -40,7 +40,7 @@ internal class AndroidxEmoji2 internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as AndroidxEmoji2
 

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
@@ -42,7 +42,7 @@ internal class FacebookEmoji internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as FacebookEmoji
 

diff --git a/...oogle-compat/src/commonMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt b/...oogle-compat/src/commonMain/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt
@@ -40,7 +40,7 @@ internal class GoogleCompatEmoji internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as GoogleCompatEmoji
 

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
@@ -42,7 +42,7 @@ internal class GoogleEmoji internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as GoogleEmoji
 

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
@@ -42,7 +42,7 @@ internal class IosEmoji internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as IosEmoji
 

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
@@ -42,7 +42,7 @@ internal class TwitterEmoji internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as TwitterEmoji
 

diff --git a/emoji/src/commonTest/kotlin/com/vanniktech/emoji/TestEmoji.kt b/emoji/src/commonTest/kotlin/com/vanniktech/emoji/TestEmoji.kt
@@ -64,7 +64,7 @@ data class TestEmoji internal constructor(
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
-    if (javaClass != other?.javaClass) return false
+    if (other == null || this::class != other::class) return false
 
     other as TestEmoji