pubnub · parfeon · Apr 30, 2024 · Apr 25, 2024 · Apr 25, 2024 · Apr 25, 2024
@@ -1832,6 +1832,11 @@
 		A5105B59238F027D00CB693D /* PNDate.m in Sources */ = {isa = PBXBuildFile; fileRef = A5105B4F238F027D00CB693D /* PNDate.m */; };
 		A5105B5A238F027D00CB693D /* PNDate.m in Sources */ = {isa = PBXBuildFile; fileRef = A5105B4F238F027D00CB693D /* PNDate.m */; };
 		A5105B5C238F027D00CB693D /* PNDate.m in Sources */ = {isa = PBXBuildFile; fileRef = A5105B4F238F027D00CB693D /* PNDate.m */; };
+		A51B49E02BDA7806008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E3B9FF2B2F669200D3AA18 /* PNRequestRetryConfiguration+Private.h */; };
+		A51B49E12BDA7806008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E3B9FF2B2F669200D3AA18 /* PNRequestRetryConfiguration+Private.h */; };
+		A51B49E22BDA7807008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E3B9FF2B2F669200D3AA18 /* PNRequestRetryConfiguration+Private.h */; };
+		A51B49E32BDA7808008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E3B9FF2B2F669200D3AA18 /* PNRequestRetryConfiguration+Private.h */; };
+		A51B49E42BDA7809008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E3B9FF2B2F669200D3AA18 /* PNRequestRetryConfiguration+Private.h */; };
 		A523692924A2270200656C19 /* PNAES+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A523692824A2270200656C19 /* PNAES+Private.h */; };
 		A523692A24A2270200656C19 /* PNAES+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A523692824A2270200656C19 /* PNAES+Private.h */; };
 		A523692B24A2270200656C19 /* PNAES+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A523692824A2270200656C19 /* PNAES+Private.h */; };
@@ -4382,6 +4387,7 @@
 				A56865B9230173030014E17C /* PNChannelMetadataChangeParser.h in Headers */,
 				A57A30DA238DC87400DE8C68 /* PNAPNSNotificationTarget.h in Headers */,
 				7951954326BD44E9001E308C /* PubNub+PAM.h in Headers */,
+				A51B49E02BDA7806008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */,
 				7915825C1BD709C60084FC70 /* PNChannelGroupsResult.h in Headers */,
 				79E20D151C8AEC3A001BC9CC /* PNEnvelopeInformation.h in Headers */,
 				A55CA69D2397389100B24E02 /* PNKeychain+Private.h in Headers */,
@@ -4675,6 +4681,7 @@
 				A56865BB230173030014E17C /* PNChannelMetadataChangeParser.h in Headers */,
 				A57A30DC238DC87400DE8C68 /* PNAPNSNotificationTarget.h in Headers */,
 				7951954526BD44E9001E308C /* PubNub+PAM.h in Headers */,
+				A51B49E22BDA7807008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */,
 				791583071BD709D10084FC70 /* PNEventsListener.h in Headers */,
 				791583051BD709D10084FC70 /* PNChannelGroupsResult.h in Headers */,
 				A55CA69F2397389100B24E02 /* PNKeychain+Private.h in Headers */,
@@ -5055,6 +5062,7 @@
 				A57A30F6238DDCA300DE8C68 /* PNAPNSNotificationPayload+Private.h in Headers */,
 				798842741C18F1FB003E8948 /* PNStatus+Private.h in Headers */,
 				798842321C18F0AC003E8948 /* PubNub+Subscribe.h in Headers */,
+				A51B49E42BDA7809008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */,
 				A57A30DF238DC87400DE8C68 /* PNAPNSNotificationTarget.h in Headers */,
 				797ABBA624C4148C0008CA1E /* PNBasePublishRequest.h in Headers */,
 				7988422C1C18F088003E8948 /* PubNub+Presence.h in Headers */,
@@ -5260,6 +5268,7 @@
 				A56865BA230173030014E17C /* PNChannelMetadataChangeParser.h in Headers */,
 				A57A30DB238DC87400DE8C68 /* PNAPNSNotificationTarget.h in Headers */,
 				7951954426BD44E9001E308C /* PubNub+PAM.h in Headers */,
+				A51B49E12BDA7806008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */,
 				79A8BC741C58F93900015BDE /* PNEventsListener.h in Headers */,
 				79A8BC721C58F93900015BDE /* PNChannelGroupsResult.h in Headers */,
 				A55CA69E2397389100B24E02 /* PNKeychain+Private.h in Headers */,
@@ -5553,6 +5562,7 @@
 				A56865BC230173030014E17C /* PNChannelMetadataChangeParser.h in Headers */,
 				A57A30DD238DC87400DE8C68 /* PNAPNSNotificationTarget.h in Headers */,
 				7951954626BD44E9001E308C /* PubNub+PAM.h in Headers */,
+				A51B49E32BDA7808008C3370 /* PNRequestRetryConfiguration+Private.h in Headers */,
 				79CBB1661BD03DE4001FC34D /* PNEventsListener.h in Headers */,
 				79CBB1261BD03DE4001FC34D /* PNChannelGroupsResult.h in Headers */,
 				A55CA6A02397389100B24E02 /* PNKeychain+Private.h in Headers */,

@@ -5,6 +5,7 @@ set -e
 WORKING_DIRECTORY="$(pwd)"
 SOURCES_FOLDER="$1"
 [[ "$2" == public-only ]] && PUBLIC_ONLY=1 || PUBLIC_ONLY=0
+PRIVATE_HEADERS=()
 PUBLIC_HEADERS=()
 ALL_HEADERS=()
 FILES=()
@@ -61,32 +62,35 @@ gather_imported_headers_in_file() {
 }
 
 
-
 if [[ $PUBLIC_ONLY == 1 ]]; then
+	regex=".*Private.h"
 	# Retrieve list of potentially public headers.
 	while IFS='' read -r HEADER_PATH; do
 		RELATIVE_PATH="${HEADER_PATH#"$WORKING_DIRECTORY/$SOURCES_FOLDER/"}"
 		FILENAME="$(echo "$RELATIVE_PATH" | rev | cut -d/ -f1 | rev)"
 		FILES+=( "$FILENAME:$RELATIVE_PATH" )
 		ALL_HEADERS+=("$RELATIVE_PATH")
+		[[ "$RELATIVE_PATH" =~ $regex ]] && PRIVATE_HEADERS+=("$RELATIVE_PATH")
 	done <<< "$(find "$WORKING_DIRECTORY/$SOURCES_FOLDER" -type f ! \( -name "*.m" -o -name ".DS_Store" -o -name "*Private.h" \))"
 
 	# Scan for public headers
 	gather_imported_headers_in_file "$SOURCES_FOLDER/PubNub.h"
 else
+	regex=".*Private.h"
 	# Retrieve list of all headers.
 	while IFS='' read -r HEADER_PATH; do
 		RELATIVE_PATH="${HEADER_PATH#"$WORKING_DIRECTORY/$SOURCES_FOLDER/"}"
 		FILENAME="$(echo "$RELATIVE_PATH" | rev | cut -d/ -f1 | rev)"
 		FILES+=( "$FILENAME:$RELATIVE_PATH" )
 		ALL_HEADERS+=("$RELATIVE_PATH")
+		[[ "$RELATIVE_PATH" =~ $regex ]] && PRIVATE_HEADERS+=("$RELATIVE_PATH")
 	done <<< "$(find "$WORKING_DIRECTORY/$SOURCES_FOLDER" -type f ! \( -name "*.m" -o -name ".DS_Store" \))"
 fi
 
 
 # Create required folders structure.
 ! [[ -d "$WORKING_DIRECTORY/Sources" ]] && mkdir -p "$WORKING_DIRECTORY/Sources"
-! [[ -d "$1/include" ]] && mkdir -p "$1/include"
+! [[ -d "$1/include" ]] && mkdir -p "$1/include/PubNub"
 
 
 # Create symbolic link to Objective-C SDK source files.
@@ -96,8 +100,23 @@ popd
 
 
 # Create symbolic links for public headers
-cd "$1/include"
-! [[ -e "PubNub.h" ]] && ln -s "../PubNub.h"
+cd "$1/include/PubNub"
+
+if [[ $PUBLIC_ONLY == 1 ]]; then
+	for HEADER_PATH in "${PUBLIC_HEADERS[@]}"; do
+		FILENAME="$(echo "$HEADER_PATH" | rev | cut -d/ -f1 | rev)"
+		! [[ -e "$FILENAME" ]] && ln -s "../../$HEADER_PATH"
+	done
+else
+	for HEADER_PATH in "${ALL_HEADERS[@]}"; do
+		FILENAME="$(echo "$HEADER_PATH" | rev | cut -d/ -f1 | rev)"
+		! [[ -e "$FILENAME" ]] && ln -s "../../$HEADER_PATH" "$FILENAME"
+	done
+fi
+
+[[ -e "PubNub.h" ]] && rm "PubNub.h"
+
+cd "../"
 
 if [[ $PUBLIC_ONLY == 1 ]]; then
 	for HEADER_PATH in "${PUBLIC_HEADERS[@]}"; do
@@ -109,4 +128,6 @@ else
 		FILENAME="$(echo "$HEADER_PATH" | rev | cut -d/ -f1 | rev)"
 		! [[ -e "$FILENAME" ]] && ln -s "../$HEADER_PATH" "$FILENAME"
 	done
-fi
+fi
+
+[[ -e "PubNub.h" ]] && rm "PubNub.h"
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.3
 //
 //  Package.swift
 //
@@ -42,21 +42,18 @@ let package = Package(
     .watchOS(.v4)
   ],
   products: [
-    // Products define the executables and libraries produced by a package, and make them visible to other packages.
     .library(
       name: "PubNub",
       targets: ["PubNub"]
     )
   ],
-  dependencies: [
-    // Dependencies declare other packages that this package depends on.
-  ],
+  dependencies: [],
   targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages which this package depends on.
     .target(
       name: "PubNub",
-      dependencies: []
+      dependencies: [],
+      path: "Sources/PubNub",
+      resources: [.copy("PrivacyInfo.xcprivacy")]
     )
   ],
   swiftLanguageVersions: [.v5]

@@ -5,8 +5,11 @@
 #import "PNReachability.h"
 #import "PubNub+CorePrivate.h"
 #import "PNConfiguration.h"
+#import "PNTimeResult.h"
+#import "PNStructures.h"
+#import "PubNub+Time.h"
+#import "PubNub+Core.h"
 #import "PNLogMacro.h"
-#import "PubNub.h"
 
 
 NS_ASSUME_NONNULL_BEGIN

@@ -0,0 +1 @@
+../Network/PNRequestRetryConfiguration+Private.h
@@ -0,0 +1 @@
+../Network/PNRequestRetryConfiguration.h
@@ -0,0 +1 @@
+../../Misc/Categories/NSArray+PNMap.h
@@ -0,0 +1 @@
+../../Misc/Categories/NSDateFormatter+PNCacheable.h
@@ -0,0 +1 @@
+../../Misc/Categories/NSInputStream+PNCrypto.h
@@ -0,0 +1 @@
+../../Misc/Categories/NSInputStream+PNURL.h
@@ -0,0 +1 @@
+../../Misc/Categories/NSURLSessionConfiguration+PNConfiguration.h
@@ -0,0 +1 @@
+../../Misc/Categories/NSURLSessionConfiguration+PNConfigurationPrivate.h
@@ -0,0 +1 @@
+../../Data/PNAES+Private.h
@@ -0,0 +1 @@
+../../Data/PNAES.h
@@ -0,0 +1 @@
+../../Modules/Crypto/Cryptors/AES/PNAESCBCCryptor+Private.h
@@ -0,0 +1 @@
+../../Modules/Crypto/Cryptors/AES/PNAESCBCCryptor.h
@@ -0,0 +1 @@
+../../Data/Builders/PNAPICallBuilder+Private.h
@@ -0,0 +1 @@
+../../Data/Builders/PNAPICallBuilder.h
@@ -0,0 +1 @@
+../../Data/Builders/API Call/APNS/PNAPNSAPICallBuilder.h
@@ -0,0 +1 @@
+../../Data/Builders/API Call/APNS/PNAPNSAuditAPICallBuilder.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNAPNSEnabledChannelsResult.h
@@ -0,0 +1 @@
+../../Data/Builders/API Call/APNS/PNAPNSModificationAPICallBuilder.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/APNS/PNAPNSNotificationConfiguration+Private.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/APNS/PNAPNSNotificationConfiguration.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/APNS/PNAPNSNotificationPayload+Private.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/APNS/PNAPNSNotificationPayload.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/APNS/PNAPNSNotificationTarget+Private.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/APNS/PNAPNSNotificationTarget.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNAcknowledgmentStatus.h
@@ -0,0 +1 @@
+../../Data/Builders/API Call/Actions/Message/PNAddMessageActionAPICallBuilder.h
@@ -0,0 +1 @@
+../../Network/Parsers/Actions/Message/PNAddMessageActionParser.h
@@ -0,0 +1 @@
+../../Network/Requests/Actions/Message/PNAddMessageActionRequest.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNAddMessageActionStatus.h
@@ -0,0 +1 @@
+../../Network/Requests/Push Notifications/PNAddPushNotificationsRequest.h
@@ -0,0 +1 @@
+../../Misc/Helpers/PNArray.h
@@ -0,0 +1 @@
+../../Network/Requests/Push Notifications/PNAuditPushNotificationsRequest.h
@@ -0,0 +1 @@
+../../Network/Requests/Actions/Message/PNBaseMessageActionRequest+Private.h
@@ -0,0 +1 @@
+../../Network/Requests/Actions/Message/PNBaseMessageActionRequest.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/PNBaseNotificationPayload+Private.h
@@ -0,0 +1 @@
+../../Misc/Helpers/Notifications Payload/PNBaseNotificationPayload.h
@@ -0,0 +1 @@
+../../Network/Requests/Objects/Membership/PNBaseObjectsMembershipRequest+Private.h
@@ -0,0 +1 @@
+../../Network/Requests/Objects/Membership/PNBaseObjectsMembershipRequest.h
@@ -0,0 +1 @@
+../../Network/Requests/Objects/PNBaseObjectsRequest+Private.h
@@ -0,0 +1 @@
+../../Network/Requests/Objects/PNBaseObjectsRequest.h
@@ -0,0 +1 @@
+../../Network/Requests/Publish/PNBasePublishRequest+Private.h
@@ -0,0 +1 @@
+../../Network/Requests/Publish/PNBasePublishRequest.h
@@ -0,0 +1 @@
+../../Network/Requests/Push Notifications/PNBasePushNotificationsRequest.h
@@ -0,0 +1 @@
+../../Data/PNCBORDecoder.h
@@ -0,0 +1 @@
+../../Modules/Crypto/Cryptors/AES/PNCCCryptorWrapper.h
@@ -0,0 +1 @@
+../../Misc/Helpers/PNChannel.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNChannelClientStateResult.h
@@ -0,0 +1 @@
+../../Network/Parsers/PNChannelGroupAuditionParser.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNChannelGroupChannelsResult.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNChannelGroupClientStateResult.h
@@ -0,0 +1 @@
+../../Network/Parsers/PNChannelGroupModificationParser.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNChannelGroupsResult.h
@@ -0,0 +1 @@
+../../Data/Models/PNChannelMember+Private.h
@@ -0,0 +1 @@
+../../Data/Models/PNChannelMember.h
@@ -0,0 +1 @@
+../../Network/Parsers/Objects/PNChannelMembersParser.h
@@ -0,0 +1 @@
+../../Data/Models/PNChannelMetadata+Private.h
@@ -0,0 +1 @@
+../../Data/Models/PNChannelMetadata.h
@@ -0,0 +1 @@
+../../Network/Parsers/Objects/PNChannelMetadataChangeParser.h
@@ -0,0 +1 @@
+../../Data/PNClientInformation.h
@@ -0,0 +1 @@
+../../Data/Managers/PNClientState.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNClientStateGetResult.h
@@ -0,0 +1 @@
+../../Network/Parsers/PNClientStateParser.h
@@ -0,0 +1 @@
+../../Data/Service Objects/PNClientStateUpdateStatus.h
@@ -0,0 +1 @@
+../../Data/PNConfiguration+Private.h
@@ -0,0 +1 @@
+../../Data/PNConfiguration.h
@@ -0,0 +1 @@
+../../Misc/PNConstants.h
@@ -0,0 +1 @@
+../../Modules/Crypto/PNCryptoModule.h
@@ -0,0 +1 @@
+../../Misc/Protocols/PNCryptoProvider.h
@@ -0,0 +1 @@
+../../Misc/Protocols/PNCryptor.h
@@ -0,0 +1 @@
+../../Modules/Crypto/Header/PNCryptorHeader+Private.h
@@ -0,0 +1 @@
+../../Modules/Crypto/Header/PNCryptorHeader.h
@@ -0,0 +1 @@
+../../Modules/Crypto/Header/PNCryptorHeaderV1Data.h