Skip to content

Commit b54e6e5

Browse files
jennantillajennantilla
authored
Merge pull request #1719 from OneSignal/fix/mac_catalyst_live_activities
[Bug] Ignore Live Activities code for Mac Catalyst
2 parents 47faaad + bba5116 commit b54e6e5

File tree

7 files changed

+61
-25
lines changed

7 files changed

+61
-25
lines changed

‎examples/RNOneSignalTS/ios/Podfile.lock‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,48 @@ PODS:
1010
- React-jsi (= 0.64.4)
1111
- ReactCommon/turbomodule/core (= 0.64.4)
1212
- glog (0.3.5)
13-
- OneSignalXCFramework (5.2.0):
14-
- OneSignalXCFramework/OneSignalComplete (= 5.2.0)
15-
- OneSignalXCFramework/OneSignal (5.2.0):
13+
- OneSignalXCFramework (5.2.1):
14+
- OneSignalXCFramework/OneSignalComplete (= 5.2.1)
15+
- OneSignalXCFramework/OneSignal (5.2.1):
1616
- OneSignalXCFramework/OneSignalCore
1717
- OneSignalXCFramework/OneSignalExtension
1818
- OneSignalXCFramework/OneSignalLiveActivities
1919
- OneSignalXCFramework/OneSignalNotifications
2020
- OneSignalXCFramework/OneSignalOSCore
2121
- OneSignalXCFramework/OneSignalOutcomes
2222
- OneSignalXCFramework/OneSignalUser
23-
- OneSignalXCFramework/OneSignalComplete (5.2.0):
23+
- OneSignalXCFramework/OneSignalComplete (5.2.1):
2424
- OneSignalXCFramework/OneSignal
2525
- OneSignalXCFramework/OneSignalInAppMessages
2626
- OneSignalXCFramework/OneSignalLocation
27-
- OneSignalXCFramework/OneSignalCore (5.2.0)
28-
- OneSignalXCFramework/OneSignalExtension (5.2.0):
27+
- OneSignalXCFramework/OneSignalCore (5.2.1)
28+
- OneSignalXCFramework/OneSignalExtension (5.2.1):
2929
- OneSignalXCFramework/OneSignalCore
3030
- OneSignalXCFramework/OneSignalOutcomes
31-
- OneSignalXCFramework/OneSignalInAppMessages (5.2.0):
31+
- OneSignalXCFramework/OneSignalInAppMessages (5.2.1):
3232
- OneSignalXCFramework/OneSignalCore
3333
- OneSignalXCFramework/OneSignalNotifications
3434
- OneSignalXCFramework/OneSignalOSCore
3535
- OneSignalXCFramework/OneSignalOutcomes
3636
- OneSignalXCFramework/OneSignalUser
37-
- OneSignalXCFramework/OneSignalLiveActivities (5.2.0):
37+
- OneSignalXCFramework/OneSignalLiveActivities (5.2.1):
3838
- OneSignalXCFramework/OneSignalCore
3939
- OneSignalXCFramework/OneSignalOSCore
4040
- OneSignalXCFramework/OneSignalUser
41-
- OneSignalXCFramework/OneSignalLocation (5.2.0):
41+
- OneSignalXCFramework/OneSignalLocation (5.2.1):
4242
- OneSignalXCFramework/OneSignalCore
4343
- OneSignalXCFramework/OneSignalNotifications
4444
- OneSignalXCFramework/OneSignalOSCore
4545
- OneSignalXCFramework/OneSignalUser
46-
- OneSignalXCFramework/OneSignalNotifications (5.2.0):
46+
- OneSignalXCFramework/OneSignalNotifications (5.2.1):
4747
- OneSignalXCFramework/OneSignalCore
4848
- OneSignalXCFramework/OneSignalExtension
4949
- OneSignalXCFramework/OneSignalOutcomes
50-
- OneSignalXCFramework/OneSignalOSCore (5.2.0):
50+
- OneSignalXCFramework/OneSignalOSCore (5.2.1):
5151
- OneSignalXCFramework/OneSignalCore
52-
- OneSignalXCFramework/OneSignalOutcomes (5.2.0):
52+
- OneSignalXCFramework/OneSignalOutcomes (5.2.1):
5353
- OneSignalXCFramework/OneSignalCore
54-
- OneSignalXCFramework/OneSignalUser (5.2.0):
54+
- OneSignalXCFramework/OneSignalUser (5.2.1):
5555
- OneSignalXCFramework/OneSignalCore
5656
- OneSignalXCFramework/OneSignalNotifications
5757
- OneSignalXCFramework/OneSignalOSCore
@@ -249,8 +249,8 @@ PODS:
249249
- React-jsi (= 0.64.4)
250250
- React-perflogger (= 0.64.4)
251251
- React-jsinspector (0.64.4)
252-
- react-native-onesignal (5.1.2):
253-
- OneSignalXCFramework (= 5.2.0)
252+
- react-native-onesignal (5.2.1):
253+
- OneSignalXCFramework (= 5.2.1)
254254
- React (< 1.0.0, >= 0.13.0)
255255
- React-perflogger (0.64.4)
256256
- React-RCTActionSheet (0.64.4):
@@ -421,9 +421,9 @@ SPEC CHECKSUMS:
421421
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
422422
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
423423
FBLazyVector: fa8275d5086566e22a26ddc385ab5772e7f9b1bd
424-
FBReactNativeSpec: 342841ad3cdf88a10071a3507d3708b236cee677
424+
FBReactNativeSpec: ac29642c312b20b463b263a24f2472d03b7cd008
425425
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
426-
OneSignalXCFramework: bdf74fdc06888f9466dc21e826fe1549ed143095
426+
OneSignalXCFramework: fbafb3b4964a37f8b0ff273419d1c0e5ac0e07d6
427427
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
428428
RCTRequired: f85fa00af016059cf88b90b8f8ff9a6af9e4b6c3
429429
RCTTypeSafety: 5279aaf0fb1ad715cbbbbee32d5c98c72598bc9c
@@ -435,7 +435,7 @@ SPEC CHECKSUMS:
435435
React-jsi: 64f80675a66899bf0f4a58b8e3908966fa516234
436436
React-jsiexecutor: 8c077bef1c64430b6034f27df1000d194551e2eb
437437
React-jsinspector: d4f6973dd474357dbaaf6f52f31ffc713bf3e766
438-
react-native-onesignal: be215738778e57af4c6da177d548e7983052d3fd
438+
react-native-onesignal: 77a5dfd158b6c190243af73e2a9fc724130fbff5
439439
React-perflogger: 5a890ca0911669421b7611661e9b58f91c805f5c
440440
React-RCTActionSheet: bd180e0879f8424a73650c5c28fbef4f3b5b27fb
441441
React-RCTAnimation: 1004d2b4be1f2cedfdc4cb2326adc95b989e6c6b

‎examples/RNOneSignalTS/ios/RNOneSignalTS.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
8E4BE6162235D7E8F6F86819 /* Pods-RNOneSignalTS-RNOneSignalTSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNOneSignalTS-RNOneSignalTSTests.debug.xcconfig"; path = "Target Support Files/Pods-RNOneSignalTS-RNOneSignalTSTests/Pods-RNOneSignalTS-RNOneSignalTSTests.debug.xcconfig"; sourceTree = "<group>"; };
105105
B0F4647666F7BF086F879F61 /* libPods-RNOneSignalTS-RNOneSignalTSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNOneSignalTS-RNOneSignalTSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
106106
C40869784097C22EC34A0B5B /* Pods-RNOneSignalTS-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNOneSignalTS-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-RNOneSignalTS-tvOS/Pods-RNOneSignalTS-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
107+
CFC85F672C34BF3A00E78C88 /* RNOneSignalWidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RNOneSignalWidgetExtension.entitlements; sourceTree = "<group>"; };
107108
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
108109
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
109110
F00EC2440AAB4AE04AB2B092 /* Pods-RNOneSignalTS-RNOneSignalTSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNOneSignalTS-RNOneSignalTSTests.release.xcconfig"; path = "Target Support Files/Pods-RNOneSignalTS-RNOneSignalTSTests/Pods-RNOneSignalTS-RNOneSignalTSTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -225,6 +226,7 @@
225226
83CBB9F61A601CBA00E9B192 = {
226227
isa = PBXGroup;
227228
children = (
229+
CFC85F672C34BF3A00E78C88 /* RNOneSignalWidgetExtension.entitlements */,
228230
13B07FAE1A68108700A75B9A /* RNOneSignalTS */,
229231
832341AE1AAA6A7D00B99B32 /* Libraries */,
230232
00E356EF1AD99517003FC87E /* RNOneSignalTSTests */,
@@ -475,17 +477,17 @@
475477
/* Begin PBXShellScriptBuildPhase section */
476478
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
477479
isa = PBXShellScriptBuildPhase;
478-
buildActionMask = 2147483647;
480+
buildActionMask = 8;
479481
files = (
480482
);
481483
inputPaths = (
482484
);
483485
name = "Bundle React Native code and images";
484486
outputPaths = (
485487
);
486-
runOnlyForDeploymentPostprocessing = 0;
488+
runOnlyForDeploymentPostprocessing = 1;
487489
shellPath = /bin/sh;
488-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
490+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
489491
};
490492
0FEF11F60825F2FC61B8C711 /* [CP] Check Pods Manifest.lock */ = {
491493
isa = PBXShellScriptBuildPhase;
@@ -889,8 +891,11 @@
889891
);
890892
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
891893
PRODUCT_NAME = RNOneSignalTS;
894+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
895+
SUPPORTS_MACCATALYST = YES;
892896
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
893897
SWIFT_VERSION = 5.0;
898+
TARGETED_DEVICE_FAMILY = "1,2";
894899
VERSIONING_SYSTEM = "apple-generic";
895900
};
896901
name = Debug;
@@ -914,7 +919,10 @@
914919
);
915920
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
916921
PRODUCT_NAME = RNOneSignalTS;
922+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
923+
SUPPORTS_MACCATALYST = YES;
917924
SWIFT_VERSION = 5.0;
925+
TARGETED_DEVICE_FAMILY = "1,2";
918926
VERSIONING_SYSTEM = "apple-generic";
919927
};
920928
name = Release;
@@ -1047,6 +1055,7 @@
10471055
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10481056
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
10491057
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
1058+
CODE_SIGN_ENTITLEMENTS = RNOneSignalWidgetExtension.entitlements;
10501059
CODE_SIGN_STYLE = Automatic;
10511060
CURRENT_PROJECT_VERSION = 1;
10521061
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1072,6 +1081,7 @@
10721081
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.RNOneSignalWidget;
10731082
PRODUCT_NAME = "$(TARGET_NAME)";
10741083
SKIP_INSTALL = YES;
1084+
SUPPORTS_MACCATALYST = YES;
10751085
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
10761086
SWIFT_EMIT_LOC_STRINGS = YES;
10771087
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1094,6 +1104,7 @@
10941104
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10951105
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
10961106
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
1107+
CODE_SIGN_ENTITLEMENTS = RNOneSignalWidgetExtension.entitlements;
10971108
CODE_SIGN_STYLE = Automatic;
10981109
COPY_PHASE_STRIP = NO;
10991110
CURRENT_PROJECT_VERSION = 1;
@@ -1119,6 +1130,7 @@
11191130
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.RNOneSignalWidget;
11201131
PRODUCT_NAME = "$(TARGET_NAME)";
11211132
SKIP_INSTALL = YES;
1133+
SUPPORTS_MACCATALYST = YES;
11221134
SWIFT_COMPILATION_MODE = wholemodule;
11231135
SWIFT_EMIT_LOC_STRINGS = YES;
11241136
SWIFT_VERSION = 5.0;

‎examples/RNOneSignalTS/ios/RNOneSignalTS/RNOneSignalTS.entitlements‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@
44
<dict>
55
<key>aps-environment</key>
66
<string>development</string>
7+
<key>com.apple.security.app-sandbox</key>
8+
<true/>
9+
<key>com.apple.security.network.client</key>
10+
<true/>
11+
<key>com.apple.security.personal-information.location</key>
12+
<true/>
713
</dict>
814
</plist>

‎examples/RNOneSignalTS/ios/RNOneSignalWidget/RNOneSignalWidgetBundle.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import WidgetKit
99
import SwiftUI
1010

11+
#if !targetEnvironment(macCatalyst)
1112
@main
1213
struct RNOneSignalWidgetBundle: WidgetBundle {
1314
var body: some Widget {
1415
RNOneSignalWidgetLiveActivity()
1516
}
1617
}
18+
#endif

‎examples/RNOneSignalTS/ios/RNOneSignalWidget/RNOneSignalWidgetLiveActivity.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Brian Smith on 4/26/24.
66
//
77

8+
#if !targetEnvironment(macCatalyst)
89
import ActivityKit
910
import WidgetKit
1011
import SwiftUI
@@ -63,3 +64,4 @@ struct RNOneSignalWidgetLiveActivity: Widget {
6364
}
6465
}
6566
}
67+
#endif

‎examples/RNOneSignalTS/ios/RNOneSignalWidgetExtension.entitlements‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.app-sandbox</key>
6+
<true/>
7+
<key>com.apple.security.network.client</key>
8+
<true/>
9+
</dict>
10+
</plist>

‎ios/RCTOneSignal/RCTOneSignalEventEmitter.m‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
133133

134134
RCT_EXPORT_METHOD(setPushToStartToken:(NSString *)activityType
135135
withToken:(NSString *)token) {
136+
#if !TARGET_OS_MACCATALYST
136137
NSError* err=nil;
137-
138138
if (@available(iOS 17.2, *)) {
139139
[OneSignalLiveActivitiesManagerImpl setPushToStartToken:activityType withToken:token error:&err];
140140
if (err) {
@@ -143,11 +143,12 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
143143
} else {
144144
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot setPushToStartToken on iOS < 17.2"]];
145145
}
146+
#endif
146147
}
147148

148149
RCT_EXPORT_METHOD(removePushToStartToken:(NSString *)activityType) {
150+
#if !TARGET_OS_MACCATALYST
149151
NSError* err=nil;
150-
151152
if (@available(iOS 17.2, *)) {
152153
[OneSignalLiveActivitiesManagerImpl removePushToStartToken:activityType error:&err];
153154
if (err) {
@@ -156,11 +157,12 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
156157
} else {
157158
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot removePushToStartToken on iOS < 17.2"]];
158159
}
160+
#endif
159161
}
160162

161163
RCT_EXPORT_METHOD(setupDefaultLiveActivity:(NSDictionary * _Nullable)options) {
164+
#if !TARGET_OS_MACCATALYST
162165
LiveActivitySetupOptions *laOptions = nil;
163-
164166
if (options != nil) {
165167
laOptions = [LiveActivitySetupOptions alloc];
166168
[laOptions setEnablePushToStart:[options[@"enablePushToStart"] boolValue]];
@@ -172,17 +174,19 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
172174
} else {
173175
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot setupDefault on iOS < 16.1"]];
174176
}
177+
#endif
175178
}
176179

177180
RCT_EXPORT_METHOD(startDefaultLiveActivity:(NSString *)activityId
178181
withAttributes:(NSDictionary * _Nonnull)attributes
179182
withContent:(NSDictionary * _Nonnull)content) {
180-
183+
#if !TARGET_OS_MACCATALYST
181184
if (@available(iOS 16.1, *)) {
182185
[OneSignalLiveActivitiesManagerImpl startDefault:activityId attributes:attributes content:content];
183186
} else {
184187
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot startDefault on iOS < 16.1"]];
185188
}
189+
#endif
186190
}
187191

188192
RCT_EXPORT_METHOD(setPrivacyConsentGiven:(BOOL)granted) {

0 commit comments

Comments
 (0)