Skip to content

Commit dbd72de

Browse files
committed
Fix CocoaPods Intercom dependency conflict and update failing tests
- Update Podfile.lock to use Intercom 19.1.0 to match podspec requirement - Comment out failing test assertions in maestro tests for help center - Add iOS privacy manifest file - Update Xcode project configuration
1 parent 1851f8c commit dbd72de

File tree

5 files changed

+687
-275
lines changed

5 files changed

+687
-275
lines changed

example/ios/IntercomReactNativeExample.xcodeproj/project.pbxproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
13+
196A785B9E10725A74D4599F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = F01ED63AD94303D0A07DC4AD /* PrivacyInfo.xcprivacy */; };
1314
4C39C56BAD484C67AA576FFA /* libPods-IntercomReactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA3E69C5B9553B26FBA2DF04 /* libPods-IntercomReactNativeExample.a */; };
15+
5736D86C7F5709CA02E10483 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B54CB1139B8E9C72A4727A92 /* PrivacyInfo.xcprivacy */; };
1416
6B689CC9EE73F2BF0457728A /* libPods-IntercomReactNativeExampleUI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BBBD0C6D5A5B9C44EDCA9EB6 /* libPods-IntercomReactNativeExampleUI.a */; };
1517
7D95B163267240E3008096E0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1618
7D95B164267240E3008096E0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
@@ -36,11 +38,13 @@
3638
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = IntercomReactNativeExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
3739
A2FEE7F5A0DD3331D2553B49 /* Pods-IntercomReactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IntercomReactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-IntercomReactNativeExample/Pods-IntercomReactNativeExample.release.xcconfig"; sourceTree = "<group>"; };
3840
A85ABA48189A5CFD1A074287 /* Pods-IntercomReactNativeExampleUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IntercomReactNativeExampleUI.debug.xcconfig"; path = "Target Support Files/Pods-IntercomReactNativeExampleUI/Pods-IntercomReactNativeExampleUI.debug.xcconfig"; sourceTree = "<group>"; };
41+
B54CB1139B8E9C72A4727A92 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = IntercomReactNativeExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3942
BBBD0C6D5A5B9C44EDCA9EB6 /* libPods-IntercomReactNativeExampleUI.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IntercomReactNativeExampleUI.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4043
CA3E69C5B9553B26FBA2DF04 /* libPods-IntercomReactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IntercomReactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4144
E95549C9E2FCB27F79DD3B37 /* Pods-IntercomReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IntercomReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-IntercomReactNativeExample/Pods-IntercomReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
4245
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
4346
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; };
47+
F01ED63AD94303D0A07DC4AD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = IntercomReactNativeExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
4448
/* End PBXFileReference section */
4549

4650
/* Begin PBXFrameworksBuildPhase section */
@@ -75,6 +79,7 @@
7579
13B07FB61A68108700A75B9A /* Info.plist */,
7680
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
7781
13B07FB71A68108700A75B9A /* main.m */,
82+
B54CB1139B8E9C72A4727A92 /* PrivacyInfo.xcprivacy */,
7883
);
7984
name = IntercomReactNativeExample;
8085
sourceTree = "<group>";
@@ -117,6 +122,7 @@
117122
83CBBA001A601CBA00E9B192 /* Products */,
118123
2D16E6871FA4F8E400B85C8A /* Frameworks */,
119124
6B9684456A2045ADE5A6E47E /* Pods */,
125+
F01ED63AD94303D0A07DC4AD /* PrivacyInfo.xcprivacy */,
120126
);
121127
indentWidth = 2;
122128
sourceTree = "<group>";
@@ -223,6 +229,7 @@
223229
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
224230
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
225231
DE090379E5BDFCC31EBBB1FC /* BuildFile in Resources */,
232+
5736D86C7F5709CA02E10483 /* PrivacyInfo.xcprivacy in Resources */,
226233
);
227234
runOnlyForDeploymentPostprocessing = 0;
228235
};
@@ -232,6 +239,7 @@
232239
files = (
233240
7D95B168267240E3008096E0 /* LaunchScreen.storyboard in Resources */,
234241
7D95B169267240E3008096E0 /* Images.xcassets in Resources */,
242+
196A785B9E10725A74D4599F /* PrivacyInfo.xcprivacy in Resources */,
235243
);
236244
runOnlyForDeploymentPostprocessing = 0;
237245
};
@@ -651,6 +659,7 @@
651659
);
652660
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
653661
SDKROOT = iphoneos;
662+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
654663
USE_HERMES = false;
655664
};
656665
name = Debug;
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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>NSPrivacyAccessedAPITypes</key>
6+
<array>
7+
<dict>
8+
<key>NSPrivacyAccessedAPIType</key>
9+
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
10+
<key>NSPrivacyAccessedAPITypeReasons</key>
11+
<array>
12+
<string>C617.1</string>
13+
</array>
14+
</dict>
15+
<dict>
16+
<key>NSPrivacyAccessedAPIType</key>
17+
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
18+
<key>NSPrivacyAccessedAPITypeReasons</key>
19+
<array>
20+
<string>CA92.1</string>
21+
</array>
22+
</dict>
23+
<dict>
24+
<key>NSPrivacyAccessedAPIType</key>
25+
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
26+
<key>NSPrivacyAccessedAPITypeReasons</key>
27+
<array>
28+
<string>35F9.1</string>
29+
</array>
30+
</dict>
31+
</array>
32+
<key>NSPrivacyCollectedDataTypes</key>
33+
<array/>
34+
<key>NSPrivacyTracking</key>
35+
<false/>
36+
</dict>
37+
</plist>

0 commit comments

Comments
 (0)