Skip to content

Commit 9416e02

Browse files
fix: carplay target compile errors by exposing module headers
1 parent 7d86cbf commit 9416e02

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

example/ios/ReactNativeNavigationSdkExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
13B07FC11A68108700A75B9A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.mm */; };
1414
29F89EA4FF546EABE968E1D2 /* libPods-ReactNativeNavigationSdkExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 354226CC8A58229ECC025410 /* libPods-ReactNativeNavigationSdkExample.a */; };
1515
2A20E8122C8994DB00DB7ADA /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.mm */; };
16-
2A20E8142C8994DB00DB7ADA /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
16+
2A20E8142C8994DB00DB7ADA /* (null) in Frameworks */ = {isa = PBXBuildFile; };
1717
2A20E8282C899A1400DB7ADA /* Info-CarPlay.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info-CarPlay.plist */; };
1818
2AB8C27A2C89A07000250560 /* Keys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 52D4271C2C81D3F300C7FB36 /* Keys.plist */; };
1919
2AB8C27E2C89A0B400250560 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
@@ -93,7 +93,7 @@
9393
isa = PBXFrameworksBuildPhase;
9494
buildActionMask = 2147483647;
9595
files = (
96-
2A20E8142C8994DB00DB7ADA /* BuildFile in Frameworks */,
96+
2A20E8142C8994DB00DB7ADA /* (null) in Frameworks */,
9797
29F89EA4FF546EABE968E1D2 /* libPods-ReactNativeNavigationSdkExample.a in Frameworks */,
9898
);
9999
runOnlyForDeploymentPostprocessing = 0;
@@ -658,7 +658,6 @@
658658
"-Wno-comma",
659659
"-Wno-shorten-64-to-32",
660660
"-fmodules",
661-
"-fcxx-modules",
662661
);
663662
OTHER_LDFLAGS = (
664663
"$(inherited)",
@@ -707,7 +706,6 @@
707706
"-Wno-comma",
708707
"-Wno-shorten-64-to-32",
709708
"-fmodules",
710-
"-fcxx-modules",
711709
);
712710
OTHER_LDFLAGS = (
713711
"$(inherited)",
@@ -919,10 +917,7 @@
919917
"-DFOLLY_CFG_NO_COROUTINES=1",
920918
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
921919
);
922-
OTHER_LDFLAGS = (
923-
"$(inherited)",
924-
" ",
925-
);
920+
OTHER_LDFLAGS = "$(inherited) ";
926921
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
927922
SDKROOT = iphoneos;
928923
USE_HERMES = true;

example/ios/ReactNativeNavigationSdkExample/CarSceneDelegate.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
@implementation CarSceneDelegate
2323

2424
- (CPMapTemplate *)getTemplate {
25-
CPMapTemplate *template = [[CPMapTemplate alloc] init];
26-
[template showPanningInterfaceAnimated:YES];
25+
CPMapTemplate *mapTemplate = [[CPMapTemplate alloc] init];
26+
[mapTemplate showPanningInterfaceAnimated:YES];
2727

2828
CPBarButton *customButton = [[CPBarButton alloc]
2929
initWithTitle:@"Custom Event"
@@ -34,9 +34,9 @@ - (CPMapTemplate *)getTemplate {
3434
data:dictionary];
3535
}];
3636

37-
template.leadingNavigationBarButtons = @[ customButton ];
38-
template.trailingNavigationBarButtons = @[];
39-
return template;
37+
mapTemplate.leadingNavigationBarButtons = @[ customButton ];
38+
mapTemplate.trailingNavigationBarButtons = @[];
39+
return mapTemplate;
4040
}
4141

4242
@end

ios/NavAutoModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define NavAutoModule_h
1818

1919
#import "NavViewController.h"
20-
#import "generated/RNNavigationSdkSpec/RNNavigationSdkSpec.h"
20+
#import "RNNavigationSdkSpec.h"
2121

2222
NS_ASSUME_NONNULL_BEGIN
2323

ios/NavModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#import <GoogleNavigation/GoogleNavigation.h>
2121
#import "INavigationCallback.h"
22-
#import "generated/RNNavigationSdkSpec/RNNavigationSdkSpec.h"
22+
#import "RNNavigationSdkSpec.h"
2323

2424
NS_ASSUME_NONNULL_BEGIN
2525

react-native-navigation-sdk.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
3030
s.source = { :git => "https://github.com/googlemaps/react-native-navigation-sdk.git", :tag => "#{s.version}" }
3131

3232
s.source_files = "ios/**/*.{h,m,mm,cpp}"
33-
s.private_header_files = "ios/generated/**/*.h"
33+
s.public_header_files = "ios/**/*.h"
3434

3535
s.dependency "React-Core"
3636
s.dependency "GoogleNavigation", "10.0.0"

0 commit comments

Comments
 (0)