Fixes according to swift module changes

pubnub · Sep 10, 2024 · 39f6a37 · 39f6a37
1 parent 0f11994
commit 39f6a37
Show file tree

Hide file tree

Showing 55 changed files with 299 additions and 251 deletions.
diff --git a/...logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt b/...logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt
@@ -111,7 +111,7 @@ class PubNubKotlinMultiplatformPlugin : Plugin<Project> {
 //                        }
 //                        version = "7.1.0"
                             source = path(rootProject.file(swiftPath))
-                            moduleName = "PubNub"
+                            moduleName = "PubNubSDK"
                             extraOpts += listOf("-compiler-option", "-fmodules")
                         }
                     }

diff --git a/pubnub-core/pubnub-core-api/src/iosMain/kotlin/com/pubnub/api/JsonElement.ios.kt b/pubnub-core/pubnub-core-api/src/iosMain/kotlin/com/pubnub/api/JsonElement.ios.kt
@@ -2,7 +2,7 @@
 
 package com.pubnub.api
 
-import cocoapods.PubNubSwift.AnyJSONObjC
+import cocoapods.PubNubSwift.KMPAnyJSON
 import kotlinx.cinterop.ExperimentalForeignApi
 
 actual abstract class JsonElement(val value: Any?) {
@@ -43,15 +43,15 @@ class JsonElementImpl(value: Any?) : JsonElement(value)
 
 actual fun JsonElement.asString(): String? {
     return when (value) {
-        is AnyJSONObjC -> value.asString()
+        is KMPAnyJSON -> value.asString()
         is String -> value
         else -> null
     }
 }
 
 actual fun JsonElement.asMap(): Map<String, JsonElement>? {
     return when (value) {
-        is AnyJSONObjC -> (value.asMap() as? Map<String, Any>)?.mapValues {
+        is KMPAnyJSON -> (value.asMap() as? Map<String, Any>)?.mapValues {
             JsonElementImpl(it.value)
         }
         is Map<*, *> -> (value as Map<String, *>)?.mapValues { JsonElementImpl(it.value) }
@@ -60,12 +60,12 @@ actual fun JsonElement.asMap(): Map<String, JsonElement>? {
 }
 
 actual fun JsonElement.isNull(): Boolean {
-    return value == null || (value as? AnyJSONObjC)?.isNull() == true
+    return value == null || (value as? KMPAnyJSON)?.isNull() == true
 }
 
 actual fun JsonElement.asList(): List<JsonElement>? {
     return when (value) {
-        is AnyJSONObjC -> value.asList()?.map {
+        is KMPAnyJSON -> value.asList()?.map {
             JsonElementImpl(it)
         }
         is List<*> -> value.map { JsonElementImpl(it) }
@@ -75,7 +75,7 @@ actual fun JsonElement.asList(): List<JsonElement>? {
 
 actual fun JsonElement.asLong(): Long? {
     return when (value) {
-        is AnyJSONObjC -> value.asInt()?.longValue
+        is KMPAnyJSON -> value.asInt()?.longValue
         is Long -> value
         is Int -> value.toLong()
         is Boolean -> if (value) {
@@ -89,15 +89,15 @@ actual fun JsonElement.asLong(): Long? {
 
 actual fun JsonElement.asBoolean(): Boolean? {
     return when (value) {
-        is AnyJSONObjC -> value.asBool()?.boolValue
+        is KMPAnyJSON -> value.asBool()?.boolValue
         is Boolean -> value
         else -> null
     }
 }
 
 actual fun JsonElement.asDouble(): Double? {
     return when (value) {
-        is AnyJSONObjC -> value.asDouble()?.doubleValue
+        is KMPAnyJSON -> value.asDouble()?.doubleValue
         is Number -> value.toDouble()
         is Boolean -> if (value) {
             1.0
@@ -110,7 +110,7 @@ actual fun JsonElement.asDouble(): Double? {
 
 actual fun JsonElement.asNumber(): Number? {
     return when (value) {
-        is AnyJSONObjC -> value.asNumber() as? Number
+        is KMPAnyJSON -> value.asNumber() as? Number
         is Number -> value
         is Boolean -> if (value) {
             1
@@ -122,5 +122,5 @@ actual fun JsonElement.asNumber(): Number? {
 }
 
 actual fun createJsonElement(any: Any?): JsonElement {
-    return JsonElementImpl(AnyJSONObjC(any))
+    return JsonElementImpl(KMPAnyJSON(any))
 }
diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/PubNubImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/PubNubImpl.kt
@@ -1,8 +1,8 @@
 package com.pubnub.api
 
-import cocoapods.PubNubSwift.PubNubObjC
-import cocoapods.PubNubSwift.PubNubSubscriptionObjC
-import cocoapods.PubNubSwift.PubNubSubscriptionSetObjC
+import cocoapods.PubNubSwift.KMPPubNub
+import cocoapods.PubNubSwift.KMPSubscription
+import cocoapods.PubNubSwift.KMPSubscriptionSet
 import cocoapods.PubNubSwift.addEventListenerWithListener
 import cocoapods.PubNubSwift.addStatusListenerWithListener
 import cocoapods.PubNubSwift.channelGroupWith
@@ -143,9 +143,9 @@ import com.pubnub.kmp.Uploadable
 import kotlinx.cinterop.ExperimentalForeignApi
 
 @OptIn(ExperimentalForeignApi::class)
-class PubNubImpl(private val pubNubObjC: PubNubObjC) : PubNub {
+class PubNubImpl(private val pubNubObjC: KMPPubNub) : PubNub {
     constructor(configuration: PNConfiguration) : this(
-        PubNubObjC(
+        KMPPubNub(
             user = configuration.userId.value,
             subKey = configuration.subscribeKey,
             pubKey = configuration.publishKey
@@ -833,7 +833,7 @@ class PubNubImpl(private val pubNubObjC: PubNubObjC) : PubNub {
 
     override fun subscriptionSetOf(subscriptions: Set<Subscription>): SubscriptionSet {
         return SubscriptionSetImpl(
-            PubNubSubscriptionSetObjC(subscriptions.filterIsInstance<SubscriptionImpl>().map { it.objCSubscription })
+            KMPSubscriptionSet(subscriptions.filterIsInstance<SubscriptionImpl>().map { it.objCSubscription })
         )
     }
 
@@ -842,14 +842,14 @@ class PubNubImpl(private val pubNubObjC: PubNubObjC) : PubNub {
         channelGroups: Set<String>,
         options: SubscriptionOptions
     ): SubscriptionSet {
-        val channelSubscriptions = channels.map { pubNubObjC.channelWith(it) }.map { entity -> PubNubSubscriptionObjC(entity) }
+        val channelSubscriptions = channels.map { pubNubObjC.channelWith(it) }.map { entity -> KMPSubscription(entity) }
         val channelGroupSubscriptions = channelGroups.map { pubNubObjC.channelGroupWith(it) }.map {
                 entity ->
-            PubNubSubscriptionObjC(entity)
+            KMPSubscription(entity)
         }
 
         return SubscriptionSetImpl(
-            PubNubSubscriptionSetObjC(channelGroupSubscriptions + channelSubscriptions)
+            KMPSubscriptionSet(channelGroupSubscriptions + channelSubscriptions)
         )
     }
 

diff --git a/...otlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt b/...otlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.deleteMessagesFrom
 import com.pubnub.api.models.consumer.history.PNDeleteMessagesResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -18,7 +18,7 @@ actual interface DeleteMessages : PNFuture<PNDeleteMessagesResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class DeleteMessagesImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channels: List<String>,
     private val start: Long?,
     private val end: Long?

diff --git a/...kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt b/...kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt
@@ -1,9 +1,9 @@
 package com.pubnub.api.endpoints
 
-import cocoapods.PubNubSwift.PubNubBoundedPageObjC
-import cocoapods.PubNubSwift.PubNubMessageActionObjC
-import cocoapods.PubNubSwift.PubNubMessageObjC
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPBoundedPage
+import cocoapods.PubNubSwift.KMPMessage
+import cocoapods.PubNubSwift.KMPMessageAction
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.fetchMessagesFrom
 import com.pubnub.api.JsonElementImpl
 import com.pubnub.api.models.consumer.PNBoundedPage
@@ -26,7 +26,7 @@ actual interface FetchMessages : PNFuture<PNFetchMessagesResult>
 
 @OptIn(ExperimentalForeignApi::class)
 open class FetchMessagesImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channels: List<String>,
     private val page: PNBoundedPage,
     private val includeUUID: Boolean,
@@ -41,7 +41,7 @@ open class FetchMessagesImpl(
             includeMeta = includeMeta,
             includeMessageActions = includeMessageActions,
             includeMessageType = includeMessageType,
-            page = PubNubBoundedPageObjC(
+            page = KMPBoundedPage(
                 start = page.start?.let { NSNumber(long = it) },
                 end = page.end?.let { NSNumber(long = it) },
                 limit = page.limit?.let { NSNumber(int = it) }
@@ -61,7 +61,7 @@ open class FetchMessagesImpl(
     }
 
     private fun mapMessages(rawValue: Map<Any?, *>?): Map<String, List<PNFetchMessageItem>> {
-        return (rawValue?.safeCast<String, List<PubNubMessageObjC>>())?.mapValues { entry ->
+        return (rawValue?.safeCast<String, List<KMPMessage>>())?.mapValues { entry ->
             entry.value.map {
                 PNFetchMessageItem(
                     uuid = it.publisher(),
@@ -77,7 +77,7 @@ open class FetchMessagesImpl(
     }
 
     private fun mapMessageActions(rawValue: List<*>): Map<String, Map<String, List<PNFetchMessageItem.Action>>>? {
-        return rawValue.filterIsInstance<PubNubMessageActionObjC>().groupBy { messageAction ->
+        return rawValue.filterIsInstance<KMPMessageAction>().groupBy { messageAction ->
             messageAction.actionType()
         }.mapValues { entry ->
             entry.value.groupBy { groupedMessageAction ->

diff --git a/...kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt b/...kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.messageCountsFor
 import com.pubnub.api.models.consumer.history.PNMessageCountResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -18,7 +18,7 @@ actual interface MessageCounts : PNFuture<PNMessageCountResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class MessageCountsImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channels: List<String>,
     private val channelsTimetoken: List<Long>
 ) : MessageCounts {

diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/Time.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/Time.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.timeOnSuccess
 import com.pubnub.api.models.consumer.PNTimeResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface Time : PNFuture<PNTimeResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class TimeImpl(
-    private val pubnub: PubNubObjC
+    private val pubnub: KMPPubNub
 ) : Time {
     override fun async(callback: Consumer<Result<PNTimeResult>>) {
         pubnub.timeOnSuccess(

diff --git a/.../src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt b/.../src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.channel_groups
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.addChannelsTo
 import com.pubnub.api.models.consumer.channel_group.PNChannelGroupsAddChannelResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface AddChannelChannelGroup : PNFuture<PNChannelGroupsAddChannelResu
 
 @OptIn(ExperimentalForeignApi::class)
 class AddChannelChannelGroupImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channels: List<String>,
     private val channelGroup: String
 ) : AddChannelChannelGroup {

diff --git a/...src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt b/...src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.channel_groups
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.listChannelsFor
 import com.pubnub.api.models.consumer.channel_group.PNChannelGroupsAllChannelsResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface AllChannelsChannelGroup : PNFuture<PNChannelGroupsAllChannelsRe
 
 @OptIn(ExperimentalForeignApi::class)
 class AllChannelsChannelGroupImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channelGroup: String
 ) : AllChannelsChannelGroup {
     override fun async(callback: Consumer<Result<PNChannelGroupsAllChannelsResult>>) {

diff --git a/...-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt b/...-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.channel_groups
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.deleteWithChannelGroup
 import com.pubnub.api.models.consumer.channel_group.PNChannelGroupsDeleteGroupResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface DeleteChannelGroup : PNFuture<PNChannelGroupsDeleteGroupResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class DeleteChannelGroupImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channelGroup: String
 ) : DeleteChannelGroup {
     override fun async(callback: Consumer<Result<PNChannelGroupsDeleteGroupResult>>) {

diff --git a/...api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt b/...api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.channel_groups
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.listChannelGroupsOnSuccess
 import com.pubnub.api.models.consumer.channel_group.PNChannelGroupsListAllResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface ListAllChannelGroup : PNFuture<PNChannelGroupsListAllResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class ListAllChannelGroupImpl(
-    private val pubnub: PubNubObjC
+    private val pubnub: KMPPubNub
 ) : ListAllChannelGroup {
     override fun async(callback: Consumer<Result<PNChannelGroupsListAllResult>>) {
         pubnub.listChannelGroupsOnSuccess(

diff --git a/...c/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt b/...c/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.channel_groups
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.removeWithChannels
 import com.pubnub.api.models.consumer.channel_group.PNChannelGroupsRemoveChannelResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface RemoveChannelChannelGroup : PNFuture<PNChannelGroupsRemoveChann
 
 @OptIn(ExperimentalForeignApi::class)
 class RemoveChannelChannelGroupImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channels: List<String>,
     private val channelGroup: String
 ) : RemoveChannelChannelGroup {

diff --git a/...lin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt b/...lin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.files
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.deleteFileWithChannel
 import com.pubnub.api.models.consumer.files.PNDeleteFileResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface DeleteFile : PNFuture<PNDeleteFileResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class DeleteFileImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channel: String,
     private val fileName: String,
     private val fileId: String

diff --git a/...n/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt b/...n/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.files
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.downloadFileWithChannel
 import com.pubnub.api.models.consumer.files.PNDownloadFileResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -19,7 +19,7 @@ actual interface DownloadFile : PNFuture<PNDownloadFileResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class DownloadFileImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channel: String,
     private val fileName: String,
     private val fileId: String

diff --git a/...lin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt b/...lin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt
@@ -1,6 +1,6 @@
 package com.pubnub.api.endpoints.files
 
-import cocoapods.PubNubSwift.PubNubObjC
+import cocoapods.PubNubSwift.KMPPubNub
 import cocoapods.PubNubSwift.getFileUrlWithChannel
 import com.pubnub.api.models.consumer.files.PNFileUrlResult
 import com.pubnub.api.v2.callbacks.Consumer
@@ -17,7 +17,7 @@ actual interface GetFileUrl : PNFuture<PNFileUrlResult>
 
 @OptIn(ExperimentalForeignApi::class)
 class GetFileUrlImpl(
-    private val pubnub: PubNubObjC,
+    private val pubnub: KMPPubNub,
     private val channel: String,
     private val fileName: String,
     private val fileId: String