Skip to content

Commit 32f7cfa

Browse files
committed
Bump ios module to 15.0.0
1 parent fd0166a commit 32f7cfa

File tree

5 files changed

+351
-315
lines changed

5 files changed

+351
-315
lines changed

example/ios/IntercomReactNativeExample.xcodeproj/project.pbxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
buildSettings = {
582582
ALWAYS_SEARCH_USER_PATHS = NO;
583583
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
584-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
584+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
585585
CLANG_CXX_LIBRARY = "libc++";
586586
CLANG_ENABLE_MODULES = YES;
587587
CLANG_ENABLE_OBJC_ARC = YES;
@@ -631,12 +631,13 @@
631631
"$(inherited)",
632632
);
633633
LIBRARY_SEARCH_PATHS = (
634+
"$(SDKROOT)/usr/lib/swift",
634635
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
635-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
636636
"\"$(inherited)\"",
637637
);
638638
MTL_ENABLE_DEBUG_INFO = YES;
639639
ONLY_ACTIVE_ARCH = YES;
640+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
640641
SDKROOT = iphoneos;
641642
};
642643
name = Debug;
@@ -646,7 +647,7 @@
646647
buildSettings = {
647648
ALWAYS_SEARCH_USER_PATHS = NO;
648649
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
649-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
650+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
650651
CLANG_CXX_LIBRARY = "libc++";
651652
CLANG_ENABLE_MODULES = YES;
652653
CLANG_ENABLE_OBJC_ARC = YES;
@@ -689,11 +690,12 @@
689690
"$(inherited)",
690691
);
691692
LIBRARY_SEARCH_PATHS = (
693+
"$(SDKROOT)/usr/lib/swift",
692694
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
693-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
694695
"\"$(inherited)\"",
695696
);
696697
MTL_ENABLE_DEBUG_INFO = NO;
698+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
697699
SDKROOT = iphoneos;
698700
VALIDATE_PRODUCT = YES;
699701
};

example/ios/IntercomReactNativeExample/AppDelegate.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#import <IntercomModule.h>
1818
#import <UserNotifications/UserNotifications.h>
1919
#import <React/RCTLinkingManager.h>
20-
#import "ReactNativeConfig.h"
20+
#import "RNCConfig.h"
2121

2222
#ifdef FB_SONARKIT_ENABLED
2323

@@ -61,8 +61,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
6161
UIViewController *rootViewController = [UIViewController new];
6262
rootViewController.view = rootView;
6363
self.window.rootViewController = rootViewController;
64-
NSString *apiKey = [ReactNativeConfig envFor:@"IOS_INTERCOM_KEY"];
65-
NSString *appId = [ReactNativeConfig envFor:@"IOS_INTERCOM_APP_ID"];
64+
NSString *apiKey = [RNCConfig envFor:@"IOS_INTERCOM_KEY"];
65+
NSString *appId = [RNCConfig envFor:@"IOS_INTERCOM_APP_ID"];
6666

6767
[IntercomModule initialize:apiKey withAppId:appId];
6868

@@ -98,7 +98,7 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull N
9898

9999
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
100100
#if DEBUG
101-
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
101+
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
102102
#else
103103
return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
104104
#endif

example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
require_relative '../node_modules/react-native/scripts/react_native_pods'
21
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
2+
require_relative '../node_modules/react-native/scripts/react_native_pods'
33

44
platform :ios, '13.0'
55

0 commit comments

Comments
 (0)