From 1909be4f16a9f733bbcec3d3a06ac6a72a966f4d Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Tue, 15 Oct 2024 10:20:52 +0100 Subject: [PATCH] Revert "Merge branch 'development' into feat/RMET-2947/subscribe-when-register" This reverts commit 5c7c037d13418f23a8a7ab85cbfa118dc01a2883, reversing changes made to d504c916f3a375b20d208fa381d3ce9703cfb259. # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 15 +-------------- .../Info.plist | 10 +++++----- .../Headers/OSFirebaseMessagingLib-Swift.h | 2 +- .../arm64-apple-ios.private.swiftinterface | 2 +- .../arm64-apple-ios.swiftdoc | Bin 22484 -> 22484 bytes .../arm64-apple-ios.swiftinterface | 2 +- .../NotificationsModel 2.mom | Bin 2242 -> 2242 bytes .../NotificationsModel.mom | Bin 2234 -> 2234 bytes .../Headers/OSFirebaseMessagingLib-Swift.h | 4 ++-- ...apple-ios-simulator.private.swiftinterface | 2 +- .../arm64-apple-ios-simulator.swiftdoc | Bin 22496 -> 22496 bytes .../arm64-apple-ios-simulator.swiftinterface | 2 +- ...apple-ios-simulator.private.swiftinterface | 2 +- .../x86_64-apple-ios-simulator.swiftdoc | Bin 22496 -> 22496 bytes .../x86_64-apple-ios-simulator.swiftinterface | 2 +- .../NotificationsModel 2.mom | Bin 2242 -> 2242 bytes .../NotificationsModel.mom | Bin 2234 -> 2234 bytes 17 files changed, 15 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10bf558..560f759 100644 --- 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 index 55623d1..721b3f0 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/Info.plist +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/Info.plist @@ -8,32 +8,32 @@ BinaryPath OSFirebaseMessagingLib.framework/OSFirebaseMessagingLib LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath OSFirebaseMessagingLib.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator BinaryPath OSFirebaseMessagingLib.framework/OSFirebaseMessagingLib LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath OSFirebaseMessagingLib.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h index fbeae77..8feb7a5 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.private.swiftinterface b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.private.swiftinterface index 42998c6..bcac3a8 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.private.swiftinterface +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftdoc b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftdoc index 4d5c821900dd5945fe2b77d7ce8a443c86813bb5..a7f14cf770ddf6c8dee0e33db7ee458308f7cf4a 100644 GIT binary patch delta 57 zcmcbzp7F|h#tHwm^^6oWipw+8N^%nO(sfPsEcJ|l(9}#J87yFEYG9yesAm8Y+pNX7 GDhvQck`dAX delta 57 zcmcbzp7F|h#tHwm6*P*=Gt)|P67$k^P4z7G4D<|*Ec6TwEEJN#Vuq#$20%d*p!jAj H##LbeNiY%C diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftinterface b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftinterface index 42998c6..bcac3a8 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios.swiftinterface +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom index b402f145d4088b27788ffbbd2351962c2a2a436c..f49f68948fba88ef064bf3e586c21cf25baa11e5 100644 GIT binary patch delta 24 ecmX>kct~&q7bEw-1_mGyVqo$L*(}PqmK^|Aga#S_ delta 24 ecmX>kct~&q7bExP1_mGyVqo(8uvwIGEjs{Jbp~nx diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom index a3a17f57cd5c759cf83a53c38b138c547a5bf2b9..d2c0c46613a35fb999c314fe58e5f13a07097a33 100644 GIT binary patch delta 24 ecmdlbxJz&Y7bEw-1_mGyVqo$L*(}PqlpO$71O@^C delta 24 ecmdlbxJz&Y7bExP1_mGyVqo(8uvwIGDLVjD^#)P^ diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h index ccf0435..62468af 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Headers/OSFirebaseMessagingLib-Swift.h +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface index 4466468..69584f6 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 2333e322df3ad15f8696b30a2b1fd845fc91eb53..05ad5ad83e3a512f2399de90f27c45afe69b006e 100644 GIT binary patch delta 67 zcmaE`p7FtY#tHuo^^6oWipw+8N^%nO(sfPsEcJ|l(9}#J87yFEYG9yesAm8Y(`4Af Qz`!uMkX3B68{@1n00HC^_y7O^ delta 67 zcmaE`p7FtY#tHuo6*P*=Gt)|P67$k^P4z7G4D<|*Ec6TwEEJN#Vuq#$20%d*ptvT( S76t}}$%U+9o81^^g#iEssuTPG diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 4466468..69584f6 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface index 8ca4020..65664fb 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index ebccfa1e5738b36f2fc82a96460794c5b1b699e2..fc070b7f36b7dad5f1fbca00ed68eaff5c92f296 100644 GIT binary patch delta 67 zcmaE`p7FtY#tHuo^^6oWipw+8N^%nO(sfPsEcJ|l(9}#J87yFEYG9yesAm8Y(`4Af Qz`!uMkX3B68{@1n00HC^_y7O^ delta 67 zcmaE`p7FtY#tHuo6*P*=Gt)|P67$k^P4z7G4D<|*Ec6TwEEJN#Vuq#$20%d*ptvT( S76t}}$%U+9o81^^g#iEssuTPG diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 8ca4020..65664fb 100644 --- a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/Modules/OSFirebaseMessagingLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/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/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel 2.mom index b402f145d4088b27788ffbbd2351962c2a2a436c..f49f68948fba88ef064bf3e586c21cf25baa11e5 100644 GIT binary patch delta 24 ecmX>kct~&q7bEw-1_mGyVqo$L*(}PqmK^|Aga#S_ delta 24 ecmX>kct~&q7bExP1_mGyVqo(8uvwIGEjs{Jbp~nx diff --git a/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom b/src/ios/frameworks/OSFirebaseMessagingLib.xcframework/ios-arm64_x86_64-simulator/OSFirebaseMessagingLib.framework/NotificationsModel.momd/NotificationsModel.mom index a3a17f57cd5c759cf83a53c38b138c547a5bf2b9..d2c0c46613a35fb999c314fe58e5f13a07097a33 100644 GIT binary patch delta 24 ecmdlbxJz&Y7bEw-1_mGyVqo$L*(}PqlpO$71O@^C delta 24 ecmdlbxJz&Y7bExP1_mGyVqo(8uvwIGDLVjD^#)P^