From 574a217024af4ca01d670c0a927c78c891e93e0f Mon Sep 17 00:00:00 2001 From: jguz-pubnub Date: Thu, 7 Nov 2024 12:55:54 +0100 Subject: [PATCH] WIP --- .../gradle/PubNubKotlinMultiplatformPlugin.kt | 13 +++++++++++-- .../pubnub-kotlin-api/pubnub_kotlin_api.podspec | 5 ++++- .../kotlin/com/pubnub/api/PubNubImpl.kt | 0 .../com/pubnub/api/endpoints/DeleteMessages.ios.kt | 0 .../com/pubnub/api/endpoints/FetchMessages.ios.kt | 0 .../com/pubnub/api/endpoints/MessageCounts.ios.kt | 0 .../kotlin/com/pubnub/api/endpoints/Time.ios.kt | 0 .../pubnub/api/endpoints/access/GrantToken.ios.kt | 0 .../pubnub/api/endpoints/access/RevokeToken.ios.kt | 0 .../channel_groups/AddChannelChannelGroup.ios.kt | 0 .../channel_groups/AllChannelsChannelGroup.ios.kt | 0 .../channel_groups/DeleteChannelGroup.ios.kt | 0 .../channel_groups/ListAllChannelGroup.ios.kt | 0 .../channel_groups/RemoveChannelChannelGroup.ios.kt | 0 .../pubnub/api/endpoints/files/DeleteFile.ios.kt | 0 .../pubnub/api/endpoints/files/DownloadFile.ios.kt | 0 .../pubnub/api/endpoints/files/GetFileUrl.ios.kt | 0 .../com/pubnub/api/endpoints/files/ListFiles.ios.kt | 0 .../api/endpoints/files/PublishFileMessage.ios.kt | 0 .../com/pubnub/api/endpoints/files/SendFile.ios.kt | 0 .../message_actions/AddMessageAction.ios.kt | 0 .../message_actions/GetMessageActions.ios.kt | 0 .../message_actions/RemoveMessageAction.ios.kt | 0 .../objects/channel/GetAllChannelMetadata.ios.kt | 0 .../objects/channel/GetChannelMetadata.ios.kt | 0 .../objects/channel/RemoveChannelMetadata.ios.kt | 0 .../objects/channel/SetChannelMetadata.ios.kt | 0 .../objects/member/GetChannelMembers.ios.kt | 0 .../objects/member/ManageChannelMembers.ios.kt | 0 .../objects/membership/GetMemberships.ios.kt | 0 .../objects/membership/ManageMemberships.ios.kt | 0 .../objects/uuid/GetAllUUIDMetadata.ios.kt | 0 .../endpoints/objects/uuid/GetUUIDMetadata.ios.kt | 0 .../objects/uuid/RemoveUUIDMetadata.ios.kt | 0 .../endpoints/objects/uuid/SetUUIDMetadata.ios.kt | 0 .../pubnub/api/endpoints/presence/GetState.ios.kt | 0 .../pubnub/api/endpoints/presence/HereNow.ios.kt | 0 .../pubnub/api/endpoints/presence/SetState.ios.kt | 0 .../pubnub/api/endpoints/presence/WhereNow.ios.kt | 0 .../com/pubnub/api/endpoints/pubsub/Publish.ios.kt | 0 .../com/pubnub/api/endpoints/pubsub/Signal.ios.kt | 0 .../api/endpoints/push/AddChannelsToPush.ios.kt | 0 .../api/endpoints/push/ListPushProvisions.ios.kt | 0 .../push/RemoveAllPushChannelsForDevice.ios.kt | 0 .../endpoints/push/RemoveChannelsFromPush.ios.kt | 0 .../pubnub/api/v2/callbacks/EventListener.ios.kt | 0 .../pubnub/api/v2/callbacks/StatusListener.ios.kt | 0 .../pubnub/internal/entities/ChannelGroupImpl.kt | 0 .../com/pubnub/internal/entities/ChannelImpl.kt | 0 .../pubnub/internal/entities/ChannelMetadataImpl.kt | 0 .../pubnub/internal/entities/UserMetadataImpl.kt | 0 .../internal/subscription/SubscriptionImpl.kt | 0 .../internal/subscription/SubscriptionSetImpl.kt | 0 .../kotlin/com/pubnub/kmp/abstractions.ios.kt | 0 .../kotlin/com/pubnub/kmp/converters.kt | 0 .../kotlin/com/pubnub/kmp/factories.ios.kt | 0 .../kotlin/com/pubnub/kmp/results.ios.kt | 0 .../kotlin/com/pubnub/kmp/platform.ios.kt | 0 .../pubnub_kotlin_core_api.podspec | 5 ++++- .../kotlin/com/pubnub/api/JsonElement.ios.kt | 0 .../kotlin/com/pubnub/api/PubNubException.kt | 0 .../kotlin/com/pubnub/api/endpoints/Time.kt | 0 .../endpoints/channel_groups/ListAllChannelGroup.kt | 0 .../com/pubnub/api/endpoints/pubsub/Signal.kt | 0 .../kotlin/com/pubnub/api/v2/PNConfiguration.ios.kt | 0 .../kotlin/com/pubnub/kmp/Downloadable.ios.kt | 0 .../{iosMain => appleMain}/kotlin/testlauncher.kt | 0 67 files changed, 19 insertions(+), 4 deletions(-) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/PubNubImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/Time.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/access/GrantToken.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/access/RevokeToken.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/files/ListFiles.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/files/PublishFileMessage.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/files/SendFile.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/message_actions/AddMessageAction.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/message_actions/GetMessageActions.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/message_actions/RemoveMessageAction.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/channel/GetAllChannelMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/channel/GetChannelMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/channel/RemoveChannelMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/channel/SetChannelMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/member/GetChannelMembers.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/member/ManageChannelMembers.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/membership/GetMemberships.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/membership/ManageMemberships.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/uuid/GetAllUUIDMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/uuid/GetUUIDMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/uuid/RemoveUUIDMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/objects/uuid/SetUUIDMetadata.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/presence/GetState.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/presence/HereNow.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/presence/SetState.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/presence/WhereNow.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/pubsub/Publish.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/pubsub/Signal.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/push/AddChannelsToPush.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/push/ListPushProvisions.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/push/RemoveAllPushChannelsForDevice.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/push/RemoveChannelsFromPush.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/v2/callbacks/EventListener.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/v2/callbacks/StatusListener.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/internal/entities/ChannelGroupImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/internal/entities/ChannelImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/internal/entities/ChannelMetadataImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/internal/entities/UserMetadataImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/internal/subscription/SubscriptionImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/internal/subscription/SubscriptionSetImpl.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/kmp/abstractions.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/kmp/converters.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/kmp/factories.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosMain => appleMain}/kotlin/com/pubnub/kmp/results.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-api/src/{iosTest => appleTest}/kotlin/com/pubnub/kmp/platform.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/JsonElement.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/PubNubException.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/Time.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/endpoints/pubsub/Signal.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/api/v2/PNConfiguration.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-core-api/src/{iosMain => appleMain}/kotlin/com/pubnub/kmp/Downloadable.ios.kt (100%) rename pubnub-kotlin/pubnub-kotlin-test/src/{iosMain => appleMain}/kotlin/testlauncher.kt (100%) diff --git a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt index 07d30479a..cd184d71d 100644 --- a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt +++ b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt @@ -24,7 +24,10 @@ class PubNubKotlinMultiplatformPlugin : Plugin { apply() extensions.configure { (this as? ExtensionAware)?.extensions?.configure { - 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 { if (enableIosTargetOther) { iosArm64() iosX64() + macosArm64() + macosX64() + tvosArm64() + tvosSimulatorArm64() + watchosArm64() + watchosSimulatorArm64() } if (enableIosSimulatorArm64) { iosSimulatorArm64() @@ -110,7 +119,7 @@ class PubNubBaseKotlinMultiplatformPlugin : Plugin { } 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 index 82131064f..5f743940b 100644 --- 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/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/PubNubImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/PubNubImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/PubNubImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/PubNubImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/DeleteMessages.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/FetchMessages.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/MessageCounts.ios.kt 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/appleMain/kotlin/com/pubnub/api/endpoints/Time.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/Time.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/Time.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/access/GrantToken.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/access/GrantToken.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/access/GrantToken.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/access/GrantToken.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/access/RevokeToken.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/access/RevokeToken.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/access/RevokeToken.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/access/RevokeToken.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/AddChannelChannelGroup.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/AllChannelsChannelGroup.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/DeleteChannelGroup.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/RemoveChannelChannelGroup.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/DeleteFile.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/DownloadFile.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/GetFileUrl.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/ListFiles.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/ListFiles.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/ListFiles.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/ListFiles.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/PublishFileMessage.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/PublishFileMessage.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/PublishFileMessage.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/PublishFileMessage.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/SendFile.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/SendFile.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/files/SendFile.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/files/SendFile.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/message_actions/AddMessageAction.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/message_actions/AddMessageAction.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/message_actions/AddMessageAction.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/message_actions/AddMessageAction.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/message_actions/GetMessageActions.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/message_actions/GetMessageActions.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/message_actions/GetMessageActions.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/message_actions/GetMessageActions.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/message_actions/RemoveMessageAction.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/message_actions/RemoveMessageAction.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/message_actions/RemoveMessageAction.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/message_actions/RemoveMessageAction.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetAllChannelMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetAllChannelMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetAllChannelMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetAllChannelMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetChannelMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetChannelMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetChannelMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/GetChannelMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/RemoveChannelMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/RemoveChannelMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/RemoveChannelMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/RemoveChannelMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/SetChannelMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/SetChannelMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/channel/SetChannelMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/channel/SetChannelMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/member/GetChannelMembers.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/member/GetChannelMembers.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/member/GetChannelMembers.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/member/GetChannelMembers.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/member/ManageChannelMembers.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/member/ManageChannelMembers.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/member/ManageChannelMembers.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/member/ManageChannelMembers.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/membership/GetMemberships.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/membership/GetMemberships.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/membership/GetMemberships.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/membership/GetMemberships.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/membership/ManageMemberships.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/membership/ManageMemberships.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/membership/ManageMemberships.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/membership/ManageMemberships.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetAllUUIDMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetAllUUIDMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetAllUUIDMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetAllUUIDMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetUUIDMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetUUIDMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetUUIDMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/GetUUIDMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/RemoveUUIDMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/RemoveUUIDMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/RemoveUUIDMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/RemoveUUIDMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/SetUUIDMetadata.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/SetUUIDMetadata.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/objects/uuid/SetUUIDMetadata.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/objects/uuid/SetUUIDMetadata.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/GetState.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/GetState.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/GetState.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/GetState.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/HereNow.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/HereNow.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/HereNow.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/HereNow.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/SetState.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/SetState.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/SetState.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/SetState.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/WhereNow.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/WhereNow.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/presence/WhereNow.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/presence/WhereNow.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/pubsub/Publish.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/pubsub/Publish.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/pubsub/Publish.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/pubsub/Publish.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/AddChannelsToPush.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/AddChannelsToPush.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/AddChannelsToPush.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/AddChannelsToPush.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/ListPushProvisions.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/ListPushProvisions.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/ListPushProvisions.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/ListPushProvisions.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/RemoveAllPushChannelsForDevice.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/RemoveAllPushChannelsForDevice.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/RemoveAllPushChannelsForDevice.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/RemoveAllPushChannelsForDevice.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/RemoveChannelsFromPush.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/RemoveChannelsFromPush.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/endpoints/push/RemoveChannelsFromPush.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/RemoveChannelsFromPush.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/v2/callbacks/EventListener.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/v2/callbacks/EventListener.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/v2/callbacks/EventListener.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/v2/callbacks/EventListener.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/v2/callbacks/StatusListener.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/v2/callbacks/StatusListener.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/api/v2/callbacks/StatusListener.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/v2/callbacks/StatusListener.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/ChannelGroupImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/ChannelGroupImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/ChannelGroupImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/ChannelGroupImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/ChannelImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/ChannelImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/ChannelImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/ChannelImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/ChannelMetadataImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/ChannelMetadataImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/ChannelMetadataImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/ChannelMetadataImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/UserMetadataImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/UserMetadataImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/entities/UserMetadataImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/entities/UserMetadataImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/subscription/SubscriptionImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/subscription/SubscriptionImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/subscription/SubscriptionImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/subscription/SubscriptionImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/subscription/SubscriptionSetImpl.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/subscription/SubscriptionSetImpl.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/internal/subscription/SubscriptionSetImpl.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/internal/subscription/SubscriptionSetImpl.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/abstractions.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/abstractions.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/abstractions.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/abstractions.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/converters.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/converters.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/converters.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/converters.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/factories.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/factories.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/factories.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/factories.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/results.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/results.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosMain/kotlin/com/pubnub/kmp/results.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/results.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/iosTest/kotlin/com/pubnub/kmp/platform.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleTest/kotlin/com/pubnub/kmp/platform.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-api/src/iosTest/kotlin/com/pubnub/kmp/platform.ios.kt rename to pubnub-kotlin/pubnub-kotlin-api/src/appleTest/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 index 868dfc354..53aec809e 100644 --- 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/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/JsonElement.ios.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/JsonElement.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/JsonElement.ios.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/JsonElement.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/PubNubException.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/PubNubException.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/PubNubException.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/PubNubException.kt diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/endpoints/Time.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/endpoints/Time.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/endpoints/Time.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/endpoints/Time.kt diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/endpoints/channel_groups/ListAllChannelGroup.kt diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/endpoints/pubsub/Signal.kt diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/v2/PNConfiguration.ios.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/v2/PNConfiguration.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/api/v2/PNConfiguration.ios.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/api/v2/PNConfiguration.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/kmp/Downloadable.ios.kt b/pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/kmp/Downloadable.ios.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-core-api/src/iosMain/kotlin/com/pubnub/kmp/Downloadable.ios.kt rename to pubnub-kotlin/pubnub-kotlin-core-api/src/appleMain/kotlin/com/pubnub/kmp/Downloadable.ios.kt diff --git a/pubnub-kotlin/pubnub-kotlin-test/src/iosMain/kotlin/testlauncher.kt b/pubnub-kotlin/pubnub-kotlin-test/src/appleMain/kotlin/testlauncher.kt similarity index 100% rename from pubnub-kotlin/pubnub-kotlin-test/src/iosMain/kotlin/testlauncher.kt rename to pubnub-kotlin/pubnub-kotlin-test/src/appleMain/kotlin/testlauncher.kt