🚫 Test merging two copies of branches

OneSignal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "3.12.7"
+  s.version          = "5.0.2"
   s.summary          = "OneSignal push notification library for mobile apps."
   s.homepage         = "https://onesignal.com"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -9,12 +9,17 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
   s.platform         = :ios, "11.0"
   s.requires_arc     = true
-
-  s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
+  s.default_subspec = "OneSignalComplete"
+    
     s.subspec 'OneSignalCore' do |ss|
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
     end
 
+    s.subspec 'OneSignalOSCore' do |ss|
+      ss.dependency 'OneSignal/OneSignalCore'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework'
+    end
+
     s.subspec 'OneSignalOutcomes' do |ss|
       ss.dependency 'OneSignal/OneSignalCore'
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
@@ -25,4 +30,52 @@ Pod::Spec.new do |s|
       ss.dependency 'OneSignal/OneSignalOutcomes'
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
     end
+
+    s.subspec 'OneSignalNotifications' do |ss|
+      ss.dependency 'OneSignal/OneSignalCore'
+      ss.dependency 'OneSignal/OneSignalOutcomes'
+      ss.dependency 'OneSignal/OneSignalExtension'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'
+    end
+
+    s.subspec 'OneSignalUser' do |ss|
+      ss.dependency 'OneSignal/OneSignalCore'
+      ss.dependency 'OneSignal/OneSignalOSCore'
+      ss.dependency 'OneSignal/OneSignalOutcomes'
+      ss.dependency 'OneSignal/OneSignalNotifications'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
+    end
+
+    s.subspec 'OneSignalLocation' do |ss|
+      ss.dependency 'OneSignal/OneSignalCore'
+      ss.dependency 'OneSignal/OneSignalOSCore'
+      ss.dependency 'OneSignal/OneSignalNotifications'
+      ss.dependency 'OneSignal/OneSignalUser'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Location/OneSignalLocation.xcframework'
+    end
+
+    s.subspec 'OneSignalInAppMessages' do |ss|
+      ss.dependency 'OneSignal/OneSignalCore'
+      ss.dependency 'OneSignal/OneSignalOSCore'
+      ss.dependency 'OneSignal/OneSignalOutcomes'
+      ss.dependency 'OneSignal/OneSignalNotifications'
+      ss.dependency 'OneSignal/OneSignalUser'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_InAppMessages/OneSignalInAppMessages.xcframework'
+    end
+
+    s.subspec 'OneSignal' do |ss|
+      ss.dependency 'OneSignal/OneSignalCore'
+      ss.dependency 'OneSignal/OneSignalOSCore'
+      ss.dependency 'OneSignal/OneSignalOutcomes'
+      ss.dependency 'OneSignal/OneSignalExtension'
+      ss.dependency 'OneSignal/OneSignalNotifications'
+      ss.dependency 'OneSignal/OneSignalUser'
+      ss.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
+    end
+
+    s.subspec 'OneSignalComplete' do |ss|
+      ss.dependency 'OneSignal/OneSignal'
+      ss.dependency 'OneSignal/OneSignalLocation'
+      ss.dependency 'OneSignal/OneSignalInAppMessages'
+    end
 end

OneSignalXCFramework.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "OneSignalXCFramework"
-    s.version          = "3.12.7"
+    s.version          = "5.0.2"
     s.summary          = "OneSignal push notification library for mobile apps."
     s.homepage         = "https://onesignal.com"
     s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -9,13 +9,17 @@ Pod::Spec.new do |s|
     s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
     s.platform         = :ios, '11.0'
     s.requires_arc     = true
-
-    s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
+    s.default_subspec = "OneSignalComplete"
 
     s.subspec 'OneSignalCore' do |ss|
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
     end
 
+    s.subspec 'OneSignalOSCore' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework'
+    end
+
     s.subspec 'OneSignalOutcomes' do |ss|
       ss.dependency 'OneSignalXCFramework/OneSignalCore'
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
@@ -26,5 +30,52 @@ Pod::Spec.new do |s|
       ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
     end
-  end
-
+
+    s.subspec 'OneSignalNotifications' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
+      ss.dependency 'OneSignalXCFramework/OneSignalExtension'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'
+    end
+
+    s.subspec 'OneSignalUser' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
+      ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
+    end
+
+    s.subspec 'OneSignalLocation' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
+      ss.dependency 'OneSignalXCFramework/OneSignalUser'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Location/OneSignalLocation.xcframework'
+    end
+
+    s.subspec 'OneSignalInAppMessages' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
+      ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
+      ss.dependency 'OneSignalXCFramework/OneSignalUser'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_InAppMessages/OneSignalInAppMessages.xcframework'
+    end
+
+    s.subspec 'OneSignal' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
+      ss.dependency 'OneSignalXCFramework/OneSignalExtension'
+      ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
+      ss.dependency 'OneSignalXCFramework/OneSignalUser'
+      ss.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
+    end
+
+    s.subspec 'OneSignalComplete' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignal'
+      ss.dependency 'OneSignalXCFramework/OneSignalLocation'
+      ss.dependency 'OneSignalXCFramework/OneSignalInAppMessages'
+    end
+end

Package.swift

@@ -4,25 +4,79 @@
 import PackageDescription
 
 let package = Package(
-    name: "OneSignal",
+    name: "OneSignalFramework",
     products: [
         .library(
-            name: "OneSignal",
-            targets: ["OneSignalWrapper"]),
+            name: "OneSignalFramework",
+            targets: ["OneSignalFrameworkWrapper"]),
+        .library(
+            name: "OneSignalInAppMessages",
+            targets: ["OneSignalInAppMessagesWrapper"]),
+        .library(
+            name: "OneSignalLocation",
+            targets: ["OneSignalLocationWrapper"]),
         .library(
             name: "OneSignalExtension",
             targets: ["OneSignalExtensionWrapper"])
     ],
     targets: [
         .target(
-            name: "OneSignalWrapper",
+            name: "OneSignalFrameworkWrapper",
+            dependencies: [
+                "OneSignalFramework",
+                "OneSignalUser",
+                "OneSignalNotifications",
+                "OneSignalExtension",
+                "OneSignalOutcomes",
+                "OneSignalOSCore",
+                "OneSignalCore"
+            ],
+            path: "OneSignalFrameworkWrapper"
+        ),
+        .target(
+            name: "OneSignalInAppMessagesWrapper",
+            dependencies: [
+                "OneSignalInAppMessages",
+                "OneSignalUser",
+                "OneSignalNotifications",
+                "OneSignalOutcomes",
+                "OneSignalOSCore",
+                "OneSignalCore"
+            ],
+            path: "OneSignalInAppMessagesWrapper"
+        ),
+        .target(
+            name: "OneSignalLocationWrapper",
+            dependencies: [
+                "OneSignalLocation",
+                "OneSignalUser",
+                "OneSignalNotifications",
+                "OneSignalOSCore",
+                "OneSignalCore"
+            ],
+            path: "OneSignalLocationWrapper"
+        ),
+        .target(
+            name: "OneSignalUserWrapper",
+            dependencies: [
+                "OneSignalUser",
+                "OneSignalNotifications",
+                "OneSignalExtension",
+                "OneSignalOutcomes",
+                "OneSignalOSCore",
+                "OneSignalCore"
+            ],
+            path: "OneSignalUserWrapper"
+        ),
+        .target(
+            name: "OneSignalNotificationsWrapper",
             dependencies: [
-                "OneSignal",
+                "OneSignalNotifications",
                 "OneSignalExtension",
                 "OneSignalOutcomes",
                 "OneSignalCore"
             ],
-            path: "OneSignalWrapper"
+            path: "OneSignalNotificationsWrapper"
         ),
         .target(
             name: "OneSignalExtensionWrapper",
@@ -41,25 +95,58 @@ let package = Package(
             ],
             path: "OneSignalOutcomesWrapper"
         ),
+        .target(
+            name: "OneSignalOSCoreWrapper",
+            dependencies: [
+                "OneSignalOSCore",
+                "OneSignalCore"
+            ],
+            path: "OneSignalOSCoreWrapper"
+        ),
         .binaryTarget(
-          name: "OneSignal",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.12.7/OneSignal.xcframework.zip",
-          checksum: "26848c739578c43bd401898d0f913eb451856a57549a445ecbe688f1a0426548"
+          name: "OneSignalFramework",
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalFramework.xcframework.zip",
+          checksum: "260bc18c3b29967f1b9f484fa0b3220c2c99f867d210276e25d625b5bc40a1a3"
+        ),
+        .binaryTarget(
+          name: "OneSignalInAppMessages",
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalInAppMessages.xcframework.zip",
+          checksum: "2da59762c380ba1251c4b0d665b6823e26e60f06f169459350f11c7c6929c7d1"
+        ),
+        .binaryTarget(
+          name: "OneSignalLocation",
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalLocation.xcframework.zip",
+          checksum: "856517d1ef5e81095f8c51ae2b98148e9e813d94f44d008aed379038d56b3fb9"
+        ),
+        .binaryTarget(
+          name: "OneSignalUser",
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalUser.xcframework.zip",
+          checksum: "9c3df89f942f9f76905c3a1404d127124b8873905c390e8cc5044c378f05df04"
+        ),
+        .binaryTarget(
+          name: "OneSignalNotifications",
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalNotifications.xcframework.zip",
+          checksum: "26065fb2f7915938653e7f4342c6181d60a421d9c53f2d665221354c0106afda"
         ),
         .binaryTarget(
           name: "OneSignalExtension",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.12.7/OneSignalExtension.xcframework.zip",
-          checksum: "38706d80fa648b555f0eefa97b95ed0a96e2614dc98e91fde10827b5d4da413d"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalExtension.xcframework.zip",
+          checksum: "c262a77df89463eab57073e4fe24db178575811d5cb273d85fb9921eb7022e99"
         ),
         .binaryTarget(
           name: "OneSignalOutcomes",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.12.7/OneSignalOutcomes.xcframework.zip",
-          checksum: "f79b274f3c4e8372fbaad1a7c37bdfb1b0feb71721649900e35ab6c391718082"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalOutcomes.xcframework.zip",
+          checksum: "3f27a9d99e8adef5e3124838c44a56084123113b937fd7a0da1565c1c94c9b08"
+        ),
+        .binaryTarget(
+          name: "OneSignalOSCore",
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalOSCore.xcframework.zip",
+          checksum: "6855fbf364583bf710cc0f9c6b444809b612290453ca3002fe6667b959175128"
         ),
         .binaryTarget(
           name: "OneSignalCore",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.12.7/OneSignalCore.xcframework.zip",
-          checksum: "1f51ffa939a5bb58b05f9a83be18e20a6d692182822a5a559396f0c567f8bde0"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.2/OneSignalCore.xcframework.zip",
+          checksum: "7fc1bb7be5d00dbb68245d657517b947e7363bfa828c00394e184bee6316c436"
         )
     ]
 )

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h

@@ -29,9 +29,9 @@
 // This project exisits to make testing OneSignal SDK changes.
 
 #import <UIKit/UIKit.h>
-#import <OneSignal/OneSignal.h>
+#import <OneSignalFramework/OneSignalFramework.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver, OSEmailSubscriptionObserver, OSInAppMessageLifecycleHandler>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSNotificationPermissionObserver, OSInAppMessageLifecycleListener, OSPushSubscriptionObserver, OSNotificationLifecycleListener, OSInAppMessageClickListener, OSNotificationClickListener>
 
 @property (strong, nonatomic) UIWindow *window;