Revert "Merge branch 'development' into feat/RMET-2947/subscribe-when…

…-register" This reverts commit 5c7c037, reversing changes made to d504c91. # Conflicts: # CHANGELOG.md
OutSystems · Oct 15, 2024 · 1909be4 · 1909be4
1 parent 8e07d9f
commit 1909be4
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,20 +9,7 @@ The changes documented here do not include those from the original repository.
 ## [Unreleased]
 
 ### Features
-- (android) Subscribes and unsubscribes from `appGeneralTopic` - `appIdentifier-general-topic-android` when registering and unregistering the device. (https://outsystemsrd.atlassian.net/browse/RMET-2948).
-- (ios) Subscribes and unsubscribes from `appGeneralTopic` - `appIdentifier-general-topic-ios` when registering and unregistering the device. (https://outsystemsrd.atlassian.net/browse/RMET-2947).
-
-### Fix
-- (ios) `NotificationClickedV2` not being triggered when deep link property is not set (https://outsystemsrd.atlassian.net/browse/RMET-3695).
-
-## [Unreleased]
-### 04-10-2024
-- Feat: Handle icon and color parameters in setupNotificationBuilder for Android 12+ compatibility
-
-## [Version 2.3.2]
-
-### Features
-- Feat: Android | Update dependency to Firebase Cloud Messaging Android library (https://outsystemsrd.atlassian.net/browse/RMET-3608).
+- iOS - Subscribes and unsubscribes from `appGeneralTopic` - `appIdentifier-general-topic-ios` when registering and unregistering the device. (https://outsystemsrd.atlassian.net/browse/RMET-2947).
 
 ## [Version 2.3.1]
 

diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/Info.plist b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/Info.plist
@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>OSFirebaseMessagingLib.framework/OSFirebaseMessagingLib</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>OSFirebaseMessagingLib.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>OSFirebaseMessagingLib.framework/OSFirebaseMessagingLib</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OSFirebaseMessagingLib.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/...amework/ios-arm64/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h b/...amework/ios-arm64/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h
@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 #ifndef OSFIREBASEMESSAGINGLIB_SWIFT_H
 #define OSFIREBASEMESSAGINGLIB_SWIFT_H
 #pragma clang diagnostic push

diff --git a/...amework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.private.swiftinterface b/...amework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.private.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// swift-compiler-version: Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 // swift-module-flags: -target arm64-apple-ios14.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSFirebaseMessagingLib
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import CoreData

diff --git a/...essagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftdoc b/...essagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftdoc
diff --git a/...ngLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftinterface b/...ngLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// swift-compiler-version: Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 // swift-module-flags: -target arm64-apple-ios14.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSFirebaseMessagingLib
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import CoreData

diff --git a/...s-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom b/...s-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom
diff --git a/...ios-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom b/...ios-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom
diff --git a/..._x86_64-simulator/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h b/..._x86_64-simulator/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h
@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 #ifndef OSFIREBASEMESSAGINGLIB_SWIFT_H
 #define OSFIREBASEMESSAGINGLIB_SWIFT_H
 #pragma clang diagnostic push
@@ -453,7 +453,7 @@ SWIFT_CLASS_NAMED("OSFCMNotification")
 #endif
 
 #elif defined(__x86_64__) && __x86_64__
-// Generated by Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 #ifndef OSFIREBASEMESSAGINGLIB_SWIFT_H
 #define OSFIREBASEMESSAGINGLIB_SWIFT_H
 #pragma clang diagnostic push

diff --git a/...dules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface b/...dules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// swift-compiler-version: Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 // swift-module-flags: -target arm64-apple-ios14.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSFirebaseMessagingLib
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import CoreData

diff --git a/...b.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/...b.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc
diff --git a/...ework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/...ework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// swift-compiler-version: Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 // swift-module-flags: -target arm64-apple-ios14.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSFirebaseMessagingLib
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import CoreData

diff --git a/...ules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface b/...ules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// swift-compiler-version: Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 // swift-module-flags: -target x86_64-apple-ios14.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSFirebaseMessagingLib
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import CoreData

diff --git a/....framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/....framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc
diff --git a/...work/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/...work/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// swift-compiler-version: Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 // swift-module-flags: -target x86_64-apple-ios14.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSFirebaseMessagingLib
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import CoreData

diff --git a/...mulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom b/...mulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom
diff --git a/...simulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom b/...simulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom