Merge branch 'feat/listeners' into feat/kmp2

pubnub · Aug 14, 2024 · 7403207 · 7403207
2 parents f1dd87e + d4f2b0f
commit 7403207
Show file tree

Hide file tree

Showing 157 changed files with 647 additions and 582 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,9 +1,14 @@
 ---
 name: swift
 scm: github.com/pubnub/swift
-version: "7.3.1"
+version: "7.3.2"
 schema: 1
 changelog:
+  - date: 2024-07-22
+    version: 7.3.2
+    changes:
+      - type: bug
+        text: "Add missing public initializers for `EncryptedData` and `EncryptedStreamData`."
   - date: 2024-06-18
     version: 7.3.1
     changes:
@@ -559,7 +564,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: PubNub
-            location: https://github.com/pubnub/swift/archive/refs/tags/7.3.1.zip
+            location: https://github.com/pubnub/swift/archive/refs/tags/7.3.2.zip
             supported-platforms:
               supported-operating-systems:
                 macOS:

diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj
@@ -16,8 +16,8 @@
 		359F779F22B7FEF700B6B46F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 359F779E22B7FEF700B6B46F /* Assets.xcassets */; };
 		359F77A222B7FEF700B6B46F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 359F77A022B7FEF700B6B46F /* LaunchScreen.storyboard */; };
 		35F0258F22BAC6C9007BD7D3 /* ConfigDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35F0258E22BAC6C9007BD7D3 /* ConfigDetailTableViewController.swift */; };
+		3D26A6152C6BB68A007B4539 /* PubNubSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 3D26A6142C6BB68A007B4539 /* PubNubSDK */; };
 		3D34160D2BB5CE20008558A0 /* DetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D34160C2BB5CE20008558A0 /* DetailTableViewController.swift */; };
-		792CF27228C4FBB300C83408 /* PubNub in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27128C4FBB300C83408 /* PubNub */; };
 		792CF27428C4FBB300C83408 /* PubNubMembership in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27328C4FBB300C83408 /* PubNubMembership */; };
 		792CF27628C4FBB300C83408 /* PubNubSpace in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27528C4FBB300C83408 /* PubNubSpace */; };
 		792CF27828C4FBB300C83408 /* PubNubUser in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27728C4FBB300C83408 /* PubNubUser */; };
@@ -70,9 +70,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				792CF27428C4FBB300C83408 /* PubNubMembership in Frameworks */,
+				3D26A6152C6BB68A007B4539 /* PubNubSDK in Frameworks */,
 				792CF27828C4FBB300C83408 /* PubNubUser in Frameworks */,
 				792CF27628C4FBB300C83408 /* PubNubSpace in Frameworks */,
-				792CF27228C4FBB300C83408 /* PubNub in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -176,10 +176,10 @@
 			);
 			name = "iOS Example";
 			packageProductDependencies = (
-				792CF27128C4FBB300C83408 /* PubNub */,
 				792CF27328C4FBB300C83408 /* PubNubMembership */,
 				792CF27528C4FBB300C83408 /* PubNubSpace */,
 				792CF27728C4FBB300C83408 /* PubNubUser */,
+				3D26A6142C6BB68A007B4539 /* PubNubSDK */,
 			);
 			productName = swiftSdkiOS;
 			productReference = 359F779422B7FEF600B6B46F /* iOS Example.app */;
@@ -464,9 +464,9 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		792CF27128C4FBB300C83408 /* PubNub */ = {
+		3D26A6142C6BB68A007B4539 /* PubNubSDK */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = PubNub;
+			productName = PubNubSDK;
 		};
 		792CF27328C4FBB300C83408 /* PubNubMembership */ = {
 			isa = XCSwiftPackageProductDependency;

diff --git a/Examples/Sources/AppDelegate.swift b/Examples/Sources/AppDelegate.swift
@@ -9,8 +9,7 @@
 //
 
 import UIKit
-
-import PubNub
+import PubNubSDK
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

diff --git a/Examples/Sources/ConfigDetailTableViewController.swift b/Examples/Sources/ConfigDetailTableViewController.swift
@@ -9,8 +9,7 @@
 //
 
 import UIKit
-
-import PubNub
+import PubNubSDK
 
 class ConfigDetailTableViewController: UITableViewController {
 

diff --git a/Examples/Sources/DetailTableViewController.swift b/Examples/Sources/DetailTableViewController.swift
@@ -11,7 +11,7 @@
 import Foundation
 import UIKit
 
-import PubNub
+import PubNubSDK
 import PubNubMembership
 import PubNubSpace
 import PubNubUser
@@ -249,12 +249,10 @@ class DetailTableViewController: UITableViewController {
           print("The signal is \(signal.payload) and was sent by \(signal.publisher ?? "")")
         case let .connectionStatusChanged(connectionChange):
           switch connectionChange {
-          case .connecting:
-            print("Status connecting...")
           case .connected:
             print("Status connected!")
-          case .reconnecting:
-            print("Status reconnecting...")
+          case .subscriptionChanged:
+            print("Subscription changed")
           case .disconnected:
             print("Status disconnected")
           case .disconnectedUnexpectedly:

diff --git a/Examples/Sources/File/FileAPIViewController.swift b/Examples/Sources/File/FileAPIViewController.swift
@@ -9,8 +9,7 @@
 //
 
 import UIKit
-
-import PubNub
+import PubNubSDK
 
 enum AlertMessageDirection: String {
   case upload = "Uploading"

diff --git a/Examples/Sources/File/LocalFileExample.swift b/Examples/Sources/File/LocalFileExample.swift
@@ -9,8 +9,7 @@
 //
 
 import Foundation
-
-import PubNub
+import PubNubSDK
 
 enum FileError: Error {
   case fileNameError

diff --git a/Package.swift b/Package.swift
@@ -22,8 +22,8 @@ let package = Package(
   products: [
     // Products define the executables and libraries produced by a package, and make them visible to other packages.
     .library(
-      name: "PubNub",
-      targets: ["PubNub"]
+      name: "PubNubSDK",
+      targets: ["PubNubSDK"]
     ),
     .library(
       name: "PubNubUser",
@@ -45,28 +45,28 @@ let package = Package(
     // 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",
+      name: "PubNubSDK",
       path: "Sources/PubNub",
       resources: [.copy("PrivacyInfo.xcprivacy")]
     ),
     .target(
       name: "PubNubUser",
-      dependencies: ["PubNub"],
+      dependencies: ["PubNubSDK"],
       path: "PubNubUser/Sources"
     ),
     .target(
       name: "PubNubSpace",
-      dependencies: ["PubNub"],
+      dependencies: ["PubNubSDK"],
       path: "PubNubSpace/Sources"
     ),
     .target(
       name: "PubNubMembership",
-      dependencies: ["PubNub", "PubNubUser", "PubNubSpace"],
+      dependencies: ["PubNubSDK", "PubNubUser", "PubNubSpace"],
       path: "PubNubMembership/Sources"
     ),
     .testTarget(
       name: "PubNubTests",
-      dependencies: ["PubNub"]
+      dependencies: ["PubNubSDK"]
     )
   ],
   swiftLanguageVersions: [.v5]