diff --git a/example/ios/SampleApp/CarSceneDelegate.h b/example/ios/SampleApp/CarSceneDelegate.h index c43a3d8..15e7676 100644 --- a/example/ios/SampleApp/CarSceneDelegate.h +++ b/example/ios/SampleApp/CarSceneDelegate.h @@ -14,7 +14,7 @@ * limitations under the License. */ #import -#import "BaseCarSceneDelegate.h" +#import @interface CarSceneDelegate : BaseCarSceneDelegate @end diff --git a/example/ios/SampleApp/CarSceneDelegate.m b/example/ios/SampleApp/CarSceneDelegate.m index af87193..ebff51e 100644 --- a/example/ios/SampleApp/CarSceneDelegate.m +++ b/example/ios/SampleApp/CarSceneDelegate.m @@ -16,8 +16,8 @@ #import "CarSceneDelegate.h" #import #import -#import "NavAutoModule.h" -#import "NavModule.h" +#import +#import @implementation CarSceneDelegate diff --git a/example/ios/SampleApp/PhoneSceneDelegate.h b/example/ios/SampleApp/PhoneSceneDelegate.h index 860d1a2..34cc18e 100644 --- a/example/ios/SampleApp/PhoneSceneDelegate.h +++ b/example/ios/SampleApp/PhoneSceneDelegate.h @@ -15,7 +15,6 @@ */ #import #import -#import "AppDelegateCarPlay.h" @interface PhoneSceneDelegate : UIResponder diff --git a/ios/react-native-navigation-sdk/BaseCarSceneDelegate.h b/ios/react-native-navigation-sdk/BaseCarSceneDelegate.h index 7ba0102..cdf1c8f 100644 --- a/ios/react-native-navigation-sdk/BaseCarSceneDelegate.h +++ b/ios/react-native-navigation-sdk/BaseCarSceneDelegate.h @@ -14,7 +14,10 @@ * limitations under the License. */ #import -#import "NavViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@class NavViewController; // forward declaration @interface BaseCarSceneDelegate : UIResponder @@ -29,3 +32,5 @@ - (CPMapTemplate *)getTemplate; @end + +NS_ASSUME_NONNULL_END diff --git a/ios/react-native-navigation-sdk/BaseCarSceneDelegate.m b/ios/react-native-navigation-sdk/BaseCarSceneDelegate.m index a455a80..4faed6e 100644 --- a/ios/react-native-navigation-sdk/BaseCarSceneDelegate.m +++ b/ios/react-native-navigation-sdk/BaseCarSceneDelegate.m @@ -19,6 +19,7 @@ #import "CustomTypes.h" #import "NavAutoModule.h" #import "NavModule.h" +#import "NavViewController.h" @implementation BaseCarSceneDelegate diff --git a/ios/react-native-navigation-sdk/NavAutoModule.h b/ios/react-native-navigation-sdk/NavAutoModule.h index 8299061..ea2be15 100644 --- a/ios/react-native-navigation-sdk/NavAutoModule.h +++ b/ios/react-native-navigation-sdk/NavAutoModule.h @@ -14,10 +14,11 @@ * limitations under the License. */ #import -#import "NavViewController.h" NS_ASSUME_NONNULL_BEGIN +@class NavViewController; // forward declaration + @interface NavAutoModule : NSObject @property(nonatomic, strong, nullable) NavViewController *viewController; diff --git a/ios/react-native-navigation-sdk/NavAutoModule.m b/ios/react-native-navigation-sdk/NavAutoModule.m index 9d51e80..899558a 100644 --- a/ios/react-native-navigation-sdk/NavAutoModule.m +++ b/ios/react-native-navigation-sdk/NavAutoModule.m @@ -16,6 +16,7 @@ #import "NavAutoModule.h" #import "NavAutoEventDispatcher.h" +#import "NavViewController.h" @implementation NavAutoModule diff --git a/react-native-navigation-sdk.podspec b/react-native-navigation-sdk.podspec index 3d34a97..936ad17 100644 --- a/react-native-navigation-sdk.podspec +++ b/react-native-navigation-sdk.podspec @@ -20,6 +20,8 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json"))) Pod::Spec.new do |s| s.name = "react-native-navigation-sdk" + s.header_dir = "ReactNativeGoogleMapsNavigation" + s.module_name = "ReactNativeGoogleMapsNavigation" s.version = package["version"] s.summary = package["description"] s.homepage = package["homepage"] @@ -30,7 +32,12 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/googlemaps/react-native-navigation-sdk.git", :tag => "#{s.version}" } s.source_files = "ios/**/*.{h,m,mm,cpp}" - s.private_header_files = "ios/**/*.h" + s.public_header_files = [ + "ios/react-native-navigation-sdk/BaseCarSceneDelegate.h", + "ios/react-native-navigation-sdk/INavigationCallback.h", + "ios/react-native-navigation-sdk/NavAutoModule.h", + "ios/react-native-navigation-sdk/NavModule.h", + ] s.dependency "React-Core" s.dependency "GoogleNavigation", "10.6.0"