WIP

pubnub · Nov 14, 2024 · 574a217 · 574a217
1 parent 926e4ac
commit 574a217
Show file tree

Hide file tree

Showing 67 changed files with 19 additions and 4 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
@@ -24,7 +24,10 @@ class PubNubKotlinMultiplatformPlugin : Plugin<Project> {
                 apply<KotlinCocoapodsPlugin>()
                 extensions.configure<KotlinMultiplatformExtension> {
                     (this as? ExtensionAware)?.extensions?.configure<CocoapodsExtension> {
-                        ios.deploymentTarget = "14"
+                        ios.deploymentTarget = "14.0"
+                        osx.deploymentTarget = "11.0"
+                        tvos.deploymentTarget = "14.0"
+                        watchos.deploymentTarget = "7.0"
 
                         // Maps custom Xcode configuration to NativeBuildType
                         xcodeConfigurationToNativeBuildType["CUSTOM_DEBUG"] = NativeBuildType.DEBUG
@@ -90,6 +93,12 @@ class PubNubBaseKotlinMultiplatformPlugin : Plugin<Project> {
                 if (enableIosTargetOther) {
                     iosArm64()
                     iosX64()
+                    macosArm64()
+                    macosX64()
+                    tvosArm64()
+                    tvosSimulatorArm64()
+                    watchosArm64()
+                    watchosSimulatorArm64()
                 }
                 if (enableIosSimulatorArm64) {
                     iosSimulatorArm64()
@@ -110,7 +119,7 @@ class PubNubBaseKotlinMultiplatformPlugin : Plugin<Project> {
                     }
 
                     if (enableAnyIosTarget) {
-                        getByName("iosMain") {
+                        getByName("appleMain") {
                             it.dependsOn(nonJvm)
                         }
                     }

diff --git a/pubnub-kotlin/pubnub-kotlin-api/pubnub_kotlin_api.podspec b/pubnub-kotlin/pubnub-kotlin-api/pubnub_kotlin_api.podspec
@@ -8,7 +8,10 @@ Pod::Spec.new do |spec|
     spec.summary                  = ''
     spec.vendored_frameworks      = 'build/cocoapods/framework/pubnub_kotlin_api.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target    = '14'
+    spec.ios.deployment_target    = '14.0'
+    spec.osx.deployment_target    = '11.0'
+    spec.tvos.deployment_target    = '14.0'
+    spec.watchos.deployment_target    = '7.0'
     spec.dependency 'PubNubSwift', '8.0.1'
 
     if !Dir.exist?('build/cocoapods/framework/pubnub_kotlin_api.framework') || Dir.empty?('build/cocoapods/framework/pubnub_kotlin_api.framework')

diff --git a/...sMain/kotlin/com/pubnub/api/PubNubImpl.kt → ...eMain/kotlin/com/pubnub/api/PubNubImpl.kt b/...sMain/kotlin/com/pubnub/api/PubNubImpl.kt → ...eMain/kotlin/com/pubnub/api/PubNubImpl.kt
diff --git a/...ubnub/api/endpoints/DeleteMessages.ios.kt → ...ubnub/api/endpoints/DeleteMessages.ios.kt b/...ubnub/api/endpoints/DeleteMessages.ios.kt → ...ubnub/api/endpoints/DeleteMessages.ios.kt
diff --git a/...pubnub/api/endpoints/FetchMessages.ios.kt → ...pubnub/api/endpoints/FetchMessages.ios.kt b/...pubnub/api/endpoints/FetchMessages.ios.kt → ...pubnub/api/endpoints/FetchMessages.ios.kt
diff --git a/...pubnub/api/endpoints/MessageCounts.ios.kt → ...pubnub/api/endpoints/MessageCounts.ios.kt b/...pubnub/api/endpoints/MessageCounts.ios.kt → ...pubnub/api/endpoints/MessageCounts.ios.kt
diff --git a/...tlin/com/pubnub/api/endpoints/Time.ios.kt → ...tlin/com/pubnub/api/endpoints/Time.ios.kt b/...tlin/com/pubnub/api/endpoints/Time.ios.kt → ...tlin/com/pubnub/api/endpoints/Time.ios.kt
diff --git a/...ub/api/endpoints/access/GrantToken.ios.kt → ...ub/api/endpoints/access/GrantToken.ios.kt b/...ub/api/endpoints/access/GrantToken.ios.kt → ...ub/api/endpoints/access/GrantToken.ios.kt
diff --git a/...b/api/endpoints/access/RevokeToken.ios.kt → ...b/api/endpoints/access/RevokeToken.ios.kt b/...b/api/endpoints/access/RevokeToken.ios.kt → ...b/api/endpoints/access/RevokeToken.ios.kt
diff --git a/...nnel_groups/AddChannelChannelGroup.ios.kt → ...nnel_groups/AddChannelChannelGroup.ios.kt b/...nnel_groups/AddChannelChannelGroup.ios.kt → ...nnel_groups/AddChannelChannelGroup.ios.kt
diff --git a/...nel_groups/AllChannelsChannelGroup.ios.kt → ...nel_groups/AllChannelsChannelGroup.ios.kt b/...nel_groups/AllChannelsChannelGroup.ios.kt → ...nel_groups/AllChannelsChannelGroup.ios.kt
diff --git a/.../channel_groups/DeleteChannelGroup.ios.kt → .../channel_groups/DeleteChannelGroup.ios.kt b/.../channel_groups/DeleteChannelGroup.ios.kt → .../channel_groups/DeleteChannelGroup.ios.kt
diff --git a/...channel_groups/ListAllChannelGroup.ios.kt → ...channel_groups/ListAllChannelGroup.ios.kt b/...channel_groups/ListAllChannelGroup.ios.kt → ...channel_groups/ListAllChannelGroup.ios.kt
diff --git a/...l_groups/RemoveChannelChannelGroup.ios.kt → ...l_groups/RemoveChannelChannelGroup.ios.kt b/...l_groups/RemoveChannelChannelGroup.ios.kt → ...l_groups/RemoveChannelChannelGroup.ios.kt
diff --git a/...nub/api/endpoints/files/DeleteFile.ios.kt → ...nub/api/endpoints/files/DeleteFile.ios.kt b/...nub/api/endpoints/files/DeleteFile.ios.kt → ...nub/api/endpoints/files/DeleteFile.ios.kt
diff --git a/...b/api/endpoints/files/DownloadFile.ios.kt → ...b/api/endpoints/files/DownloadFile.ios.kt b/...b/api/endpoints/files/DownloadFile.ios.kt → ...b/api/endpoints/files/DownloadFile.ios.kt
diff --git a/...nub/api/endpoints/files/GetFileUrl.ios.kt → ...nub/api/endpoints/files/GetFileUrl.ios.kt b/...nub/api/endpoints/files/GetFileUrl.ios.kt → ...nub/api/endpoints/files/GetFileUrl.ios.kt
diff --git a/...bnub/api/endpoints/files/ListFiles.ios.kt → ...bnub/api/endpoints/files/ListFiles.ios.kt b/...bnub/api/endpoints/files/ListFiles.ios.kt → ...bnub/api/endpoints/files/ListFiles.ios.kt
diff --git a/...endpoints/files/PublishFileMessage.ios.kt → ...endpoints/files/PublishFileMessage.ios.kt b/...endpoints/files/PublishFileMessage.ios.kt → ...endpoints/files/PublishFileMessage.ios.kt
diff --git a/...ubnub/api/endpoints/files/SendFile.ios.kt → ...ubnub/api/endpoints/files/SendFile.ios.kt b/...ubnub/api/endpoints/files/SendFile.ios.kt → ...ubnub/api/endpoints/files/SendFile.ios.kt
diff --git a/...s/message_actions/AddMessageAction.ios.kt → ...s/message_actions/AddMessageAction.ios.kt b/...s/message_actions/AddMessageAction.ios.kt → ...s/message_actions/AddMessageAction.ios.kt
diff --git a/.../message_actions/GetMessageActions.ios.kt → .../message_actions/GetMessageActions.ios.kt b/.../message_actions/GetMessageActions.ios.kt → .../message_actions/GetMessageActions.ios.kt
diff --git a/...essage_actions/RemoveMessageAction.ios.kt → ...essage_actions/RemoveMessageAction.ios.kt b/...essage_actions/RemoveMessageAction.ios.kt → ...essage_actions/RemoveMessageAction.ios.kt
diff --git a/...ects/channel/GetAllChannelMetadata.ios.kt → ...ects/channel/GetAllChannelMetadata.ios.kt b/...ects/channel/GetAllChannelMetadata.ios.kt → ...ects/channel/GetAllChannelMetadata.ios.kt
diff --git a/...objects/channel/GetChannelMetadata.ios.kt → ...objects/channel/GetChannelMetadata.ios.kt b/...objects/channel/GetChannelMetadata.ios.kt → ...objects/channel/GetChannelMetadata.ios.kt
diff --git a/...ects/channel/RemoveChannelMetadata.ios.kt → ...ects/channel/RemoveChannelMetadata.ios.kt b/...ects/channel/RemoveChannelMetadata.ios.kt → ...ects/channel/RemoveChannelMetadata.ios.kt
diff --git a/...objects/channel/SetChannelMetadata.ios.kt → ...objects/channel/SetChannelMetadata.ios.kt b/...objects/channel/SetChannelMetadata.ios.kt → ...objects/channel/SetChannelMetadata.ios.kt
diff --git a/...s/objects/member/GetChannelMembers.ios.kt → ...s/objects/member/GetChannelMembers.ios.kt b/...s/objects/member/GetChannelMembers.ios.kt → ...s/objects/member/GetChannelMembers.ios.kt
diff --git a/...bjects/member/ManageChannelMembers.ios.kt → ...bjects/member/ManageChannelMembers.ios.kt b/...bjects/member/ManageChannelMembers.ios.kt → ...bjects/member/ManageChannelMembers.ios.kt
diff --git a/.../objects/membership/GetMemberships.ios.kt → .../objects/membership/GetMemberships.ios.kt b/.../objects/membership/GetMemberships.ios.kt → .../objects/membership/GetMemberships.ios.kt
diff --git a/...jects/membership/ManageMemberships.ios.kt → ...jects/membership/ManageMemberships.ios.kt b/...jects/membership/ManageMemberships.ios.kt → ...jects/membership/ManageMemberships.ios.kt
diff --git a/...ts/objects/uuid/GetAllUUIDMetadata.ios.kt → ...ts/objects/uuid/GetAllUUIDMetadata.ios.kt b/...ts/objects/uuid/GetAllUUIDMetadata.ios.kt → ...ts/objects/uuid/GetAllUUIDMetadata.ios.kt
diff --git a/...oints/objects/uuid/GetUUIDMetadata.ios.kt → ...oints/objects/uuid/GetUUIDMetadata.ios.kt b/...oints/objects/uuid/GetUUIDMetadata.ios.kt → ...oints/objects/uuid/GetUUIDMetadata.ios.kt
diff --git a/...ts/objects/uuid/RemoveUUIDMetadata.ios.kt → ...ts/objects/uuid/RemoveUUIDMetadata.ios.kt b/...ts/objects/uuid/RemoveUUIDMetadata.ios.kt → ...ts/objects/uuid/RemoveUUIDMetadata.ios.kt
diff --git a/...oints/objects/uuid/SetUUIDMetadata.ios.kt → ...oints/objects/uuid/SetUUIDMetadata.ios.kt b/...oints/objects/uuid/SetUUIDMetadata.ios.kt → ...oints/objects/uuid/SetUUIDMetadata.ios.kt
diff --git a/...ub/api/endpoints/presence/GetState.ios.kt → ...ub/api/endpoints/presence/GetState.ios.kt b/...ub/api/endpoints/presence/GetState.ios.kt → ...ub/api/endpoints/presence/GetState.ios.kt
diff --git a/...nub/api/endpoints/presence/HereNow.ios.kt → ...nub/api/endpoints/presence/HereNow.ios.kt b/...nub/api/endpoints/presence/HereNow.ios.kt → ...nub/api/endpoints/presence/HereNow.ios.kt
diff --git a/...ub/api/endpoints/presence/SetState.ios.kt → ...ub/api/endpoints/presence/SetState.ios.kt b/...ub/api/endpoints/presence/SetState.ios.kt → ...ub/api/endpoints/presence/SetState.ios.kt
diff --git a/...ub/api/endpoints/presence/WhereNow.ios.kt → ...ub/api/endpoints/presence/WhereNow.ios.kt b/...ub/api/endpoints/presence/WhereNow.ios.kt → ...ub/api/endpoints/presence/WhereNow.ios.kt
diff --git a/...ubnub/api/endpoints/pubsub/Publish.ios.kt → ...ubnub/api/endpoints/pubsub/Publish.ios.kt b/...ubnub/api/endpoints/pubsub/Publish.ios.kt → ...ubnub/api/endpoints/pubsub/Publish.ios.kt
diff --git a/...pubnub/api/endpoints/pubsub/Signal.ios.kt → ...pubnub/api/endpoints/pubsub/Signal.ios.kt b/...pubnub/api/endpoints/pubsub/Signal.ios.kt → ...pubnub/api/endpoints/pubsub/Signal.ios.kt
diff --git a/...i/endpoints/push/AddChannelsToPush.ios.kt → ...i/endpoints/push/AddChannelsToPush.ios.kt b/...i/endpoints/push/AddChannelsToPush.ios.kt → ...i/endpoints/push/AddChannelsToPush.ios.kt
diff --git a/.../endpoints/push/ListPushProvisions.ios.kt → .../endpoints/push/ListPushProvisions.ios.kt b/.../endpoints/push/ListPushProvisions.ios.kt → .../endpoints/push/ListPushProvisions.ios.kt
diff --git a/...ush/RemoveAllPushChannelsForDevice.ios.kt → ...ush/RemoveAllPushChannelsForDevice.ios.kt b/...ush/RemoveAllPushChannelsForDevice.ios.kt → ...ush/RemoveAllPushChannelsForDevice.ios.kt
diff --git a/...points/push/RemoveChannelsFromPush.ios.kt → ...points/push/RemoveChannelsFromPush.ios.kt b/...points/push/RemoveChannelsFromPush.ios.kt → ...points/push/RemoveChannelsFromPush.ios.kt
diff --git a/...nub/api/v2/callbacks/EventListener.ios.kt → ...nub/api/v2/callbacks/EventListener.ios.kt b/...nub/api/v2/callbacks/EventListener.ios.kt → ...nub/api/v2/callbacks/EventListener.ios.kt
diff --git a/...ub/api/v2/callbacks/StatusListener.ios.kt → ...ub/api/v2/callbacks/StatusListener.ios.kt b/...ub/api/v2/callbacks/StatusListener.ios.kt → ...ub/api/v2/callbacks/StatusListener.ios.kt
diff --git a/...nub/internal/entities/ChannelGroupImpl.kt → ...nub/internal/entities/ChannelGroupImpl.kt b/...nub/internal/entities/ChannelGroupImpl.kt → ...nub/internal/entities/ChannelGroupImpl.kt
diff --git a/...m/pubnub/internal/entities/ChannelImpl.kt → ...m/pubnub/internal/entities/ChannelImpl.kt b/...m/pubnub/internal/entities/ChannelImpl.kt → ...m/pubnub/internal/entities/ChannelImpl.kt
diff --git a/.../internal/entities/ChannelMetadataImpl.kt → .../internal/entities/ChannelMetadataImpl.kt b/.../internal/entities/ChannelMetadataImpl.kt → .../internal/entities/ChannelMetadataImpl.kt
diff --git a/...nub/internal/entities/UserMetadataImpl.kt → ...nub/internal/entities/UserMetadataImpl.kt b/...nub/internal/entities/UserMetadataImpl.kt → ...nub/internal/entities/UserMetadataImpl.kt
diff --git a/...internal/subscription/SubscriptionImpl.kt → ...internal/subscription/SubscriptionImpl.kt b/...internal/subscription/SubscriptionImpl.kt → ...internal/subscription/SubscriptionImpl.kt
diff --git a/...ernal/subscription/SubscriptionSetImpl.kt → ...ernal/subscription/SubscriptionSetImpl.kt b/...ernal/subscription/SubscriptionSetImpl.kt → ...ernal/subscription/SubscriptionSetImpl.kt
diff --git a/...kotlin/com/pubnub/kmp/abstractions.ios.kt → ...kotlin/com/pubnub/kmp/abstractions.ios.kt b/...kotlin/com/pubnub/kmp/abstractions.ios.kt → ...kotlin/com/pubnub/kmp/abstractions.ios.kt
diff --git a/...sMain/kotlin/com/pubnub/kmp/converters.kt → ...eMain/kotlin/com/pubnub/kmp/converters.kt b/...sMain/kotlin/com/pubnub/kmp/converters.kt → ...eMain/kotlin/com/pubnub/kmp/converters.kt
diff --git a/...in/kotlin/com/pubnub/kmp/factories.ios.kt → ...in/kotlin/com/pubnub/kmp/factories.ios.kt b/...in/kotlin/com/pubnub/kmp/factories.ios.kt → ...in/kotlin/com/pubnub/kmp/factories.ios.kt
diff --git a/...Main/kotlin/com/pubnub/kmp/results.ios.kt → ...Main/kotlin/com/pubnub/kmp/results.ios.kt b/...Main/kotlin/com/pubnub/kmp/results.ios.kt → ...Main/kotlin/com/pubnub/kmp/results.ios.kt
diff --git a/...est/kotlin/com/pubnub/kmp/platform.ios.kt → ...est/kotlin/com/pubnub/kmp/platform.ios.kt b/...est/kotlin/com/pubnub/kmp/platform.ios.kt → ...est/kotlin/com/pubnub/kmp/platform.ios.kt
diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/pubnub_kotlin_core_api.podspec b/pubnub-kotlin/pubnub-kotlin-core-api/pubnub_kotlin_core_api.podspec
@@ -8,7 +8,10 @@ Pod::Spec.new do |spec|
     spec.summary                  = ''
     spec.vendored_frameworks      = 'build/cocoapods/framework/pubnub_kotlin_core_api.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target    = '14'
+    spec.ios.deployment_target    = '14.0'
+    spec.osx.deployment_target    = '11.0'
+    spec.tvos.deployment_target    = '14.0'
+    spec.watchos.deployment_target    = '7.0'
     spec.dependency 'PubNubSwift', '8.0.1'
 
     if !Dir.exist?('build/cocoapods/framework/pubnub_kotlin_core_api.framework') || Dir.empty?('build/cocoapods/framework/pubnub_kotlin_core_api.framework')

diff --git a/.../kotlin/com/pubnub/api/JsonElement.ios.kt → .../kotlin/com/pubnub/api/JsonElement.ios.kt b/.../kotlin/com/pubnub/api/JsonElement.ios.kt → .../kotlin/com/pubnub/api/JsonElement.ios.kt
diff --git a/.../kotlin/com/pubnub/api/PubNubException.kt → .../kotlin/com/pubnub/api/PubNubException.kt b/.../kotlin/com/pubnub/api/PubNubException.kt → .../kotlin/com/pubnub/api/PubNubException.kt
diff --git a/...n/kotlin/com/pubnub/api/endpoints/Time.kt → ...n/kotlin/com/pubnub/api/endpoints/Time.kt b/...n/kotlin/com/pubnub/api/endpoints/Time.kt → ...n/kotlin/com/pubnub/api/endpoints/Time.kt
diff --git a/...nts/channel_groups/ListAllChannelGroup.kt → ...nts/channel_groups/ListAllChannelGroup.kt b/...nts/channel_groups/ListAllChannelGroup.kt → ...nts/channel_groups/ListAllChannelGroup.kt
diff --git a/...com/pubnub/api/endpoints/pubsub/Signal.kt → ...com/pubnub/api/endpoints/pubsub/Signal.kt b/...com/pubnub/api/endpoints/pubsub/Signal.kt → ...com/pubnub/api/endpoints/pubsub/Signal.kt
diff --git a/.../com/pubnub/api/v2/PNConfiguration.ios.kt → .../com/pubnub/api/v2/PNConfiguration.ios.kt b/.../com/pubnub/api/v2/PNConfiguration.ios.kt → .../com/pubnub/api/v2/PNConfiguration.ios.kt
diff --git a/...kotlin/com/pubnub/kmp/Downloadable.ios.kt → ...kotlin/com/pubnub/kmp/Downloadable.ios.kt b/...kotlin/com/pubnub/kmp/Downloadable.ios.kt → ...kotlin/com/pubnub/kmp/Downloadable.ios.kt
diff --git a/...n-test/src/iosMain/kotlin/testlauncher.kt → ...test/src/appleMain/kotlin/testlauncher.kt b/...n-test/src/iosMain/kotlin/testlauncher.kt → ...test/src/appleMain/kotlin/testlauncher.kt