Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RN 0.40] Update iOS header imports and JS SyntheticEvent import for RN 0.40 #923

Merged
merged 2 commits into from
Jan 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion example/examples/EventListener.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React, { PropTypes } from 'react';
import SyntheticEvent from 'react/lib/SyntheticEvent';
import {
StyleSheet,
View,
Text,
Dimensions,
ScrollView,
} from 'react-native';
// eslint-disable-next-line max-len
import SyntheticEvent from 'react-native/Libraries/Renderer/src/renderers/shared/stack/event/SyntheticEvent';
import MapView from 'react-native-maps';
import PriceMarker from './PriceMarker';

Expand Down
13 changes: 6 additions & 7 deletions example/ios/AirMapsExplorer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
21E6570C1D77591A00B75EE5 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */; };
21E6570E1D77591F00B75EE5 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E6570D1D77591F00B75EE5 /* MapKit.framework */; };
21E657101D77594C00B75EE5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E6570F1D77594C00B75EE5 /* AudioToolbox.framework */; };
3E4E0B5921E01BC4043FD8CD /* Pods_AirMapsExplorer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */; };
8620CC871DBD814A00B79BFE /* AIRGMSMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8620CC6E1DBD814A00B79BFE /* AIRGMSMarker.m */; };
8620CC881DBD814A00B79BFE /* AIRGoogleMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 8620CC701DBD814A00B79BFE /* AIRGoogleMap.m */; };
8620CC891DBD814A00B79BFE /* AIRGoogleMapCallout.m in Sources */ = {isa = PBXBuildFile; fileRef = 8620CC721DBD814A00B79BFE /* AIRGoogleMapCallout.m */; };
Expand All @@ -50,7 +49,7 @@
8697D6251DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8697D6241DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m */; };
86DE6F881DCE7D21002A5053 /* AIRGoogleMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 86DE6F871DCE7D21002A5053 /* AIRGoogleMapUrlTile.m */; };
86DE6F8B1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 86DE6F8A1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m */; };
C9315A21AD5A149EB5B40F29 /* Pods_AirMapsExplorer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24EB66BA0860A4DCD4CA3D77 /* Pods_AirMapsExplorer.framework */; };
A622B8115793E41C70169A8B /* libPods-AirMapsExplorer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -66,6 +65,7 @@
/* Begin PBXFileReference section */
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
00E356EE1AD99517003FC87E /* AirMapsExplorerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AirMapsExplorerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AirMapsExplorer.a"; sourceTree = BUILT_PRODUCTS_DIR; };
13B07F961A680F5B00A75B9A /* AirMapsExplorer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AirMapsExplorer.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = AirMapsExplorer/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = AirMapsExplorer/AppDelegate.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -116,7 +116,6 @@
21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
21E6570D1D77591F00B75EE5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
21E6570F1D77594C00B75EE5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AirMapsExplorer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8620CC6D1DBD814A00B79BFE /* AIRGMSMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGMSMarker.h; sourceTree = "<group>"; };
8620CC6E1DBD814A00B79BFE /* AIRGMSMarker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGMSMarker.m; sourceTree = "<group>"; };
8620CC6F1DBD814A00B79BFE /* AIRGoogleMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMap.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -147,12 +146,12 @@
8697D6211DBEDE6100DB7D0F /* AIRGoogleMapCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapCircle.m; sourceTree = "<group>"; };
8697D6231DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMapCircleManager.h; sourceTree = "<group>"; };
8697D6241DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapCircleManager.m; sourceTree = "<group>"; };
BE5DE1E9AE25978F88CD940A /* Pods-AirMapsExplorer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.debug.xcconfig"; sourceTree = "<group>"; };
E138AD0CDB08FE57B09B18F8 /* Pods-AirMapsExplorer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.release.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.release.xcconfig"; sourceTree = "<group>"; };
86DE6F861DCE7D21002A5053 /* AIRGoogleMapUrlTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMapUrlTile.h; sourceTree = "<group>"; };
86DE6F871DCE7D21002A5053 /* AIRGoogleMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapUrlTile.m; sourceTree = "<group>"; };
86DE6F891DCE8543002A5053 /* AIRGoogleMapUrlTileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMapUrlTileManager.h; sourceTree = "<group>"; };
86DE6F8A1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapURLTileManager.m; sourceTree = "<group>"; };
BE5DE1E9AE25978F88CD940A /* Pods-AirMapsExplorer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.debug.xcconfig"; sourceTree = "<group>"; };
E138AD0CDB08FE57B09B18F8 /* Pods-AirMapsExplorer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.release.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -171,7 +170,7 @@
21E6570E1D77591F00B75EE5 /* MapKit.framework in Frameworks */,
21E6570C1D77591A00B75EE5 /* MobileCoreServices.framework in Frameworks */,
21E6570A1D77591400B75EE5 /* SystemConfiguration.framework in Frameworks */,
3E4E0B5921E01BC4043FD8CD /* Pods_AirMapsExplorer.framework in Frameworks */,
A622B8115793E41C70169A8B /* libPods-AirMapsExplorer.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -190,7 +189,7 @@
21E6570D1D77591F00B75EE5 /* MapKit.framework */,
21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */,
21E657091D77591400B75EE5 /* SystemConfiguration.framework */,
3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */,
0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down
2 changes: 1 addition & 1 deletion example/ios/AirMapsExplorer/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#import "AppDelegate.h"

#import "RCTRootView.h"
#import <React/RCTRootView.h>

#import <GoogleMaps/GoogleMaps.h>

Expand Down
4 changes: 2 additions & 2 deletions example/ios/AirMapsExplorerTests/AirMapsExplorerTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#import <UIKit/UIKit.h>
#import <XCTest/XCTest.h>

#import "RCTLog.h"
#import "RCTRootView.h"
#import <React/RCTLog.h>
#import <React/RCTRootView.h>

#define TIMEOUT_SECONDS 240
#define TEXT_TO_LOOK_FOR @"Welcome to React Native!"
Expand Down
36 changes: 6 additions & 30 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
# You Podfile should look similar to this file. Whether you use_frameworks! or not, the following configuration should work.
#
# However if you DO NOT use_frameworks! and you prefer to install pods instead of
# dragging the AirMaps directory into your project, refer to the comments below (steps 1~4)

# You Podfile should look similar to this file. React Native currently does not support use_frameworks!
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.0'
use_frameworks!

# Change 'AirMapsExplorer' to match the target in your Xcode project.
target 'AirMapsExplorer' do
pod 'React', path: '../node_modules/react-native', :subspecs => [
'Core',
'RCTActionSheet',
'RCTAnimation',
'RCTGeolocation',
'RCTImage',
'RCTLinkingIOS',
Expand All @@ -23,29 +19,9 @@ target 'AirMapsExplorer' do
'RCTWebSocket'
]

# when not using frameworks we can do this instead of including the source files in our project (1/4):
# pod 'react-native-maps', path: '../../'
# pod 'react-native-google-maps', path: '../../' # <~~ if you need GoogleMaps support on iOS

# when not using frameworks we can remove this line (2/4):
pod 'GoogleMaps' # <~~ remove this line if you do not want to support GoogleMaps on iOS
end

# when not using frameworks this might be necessary, but try without it first and see if `pod install` works (3/4):
# THIS IS ONLY NECESSARY IF YOU NEED GoogleMaps SUPPORT
# pre_install do |installer|
# # copied from https://github.com/CocoaPods/CocoaPods/issues/2926
# # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
# def installer.verify_no_static_framework_transitive_dependencies; end
# end

# when not using frameworks (4/4):
# THIS IS ONLY NECESSARY IF YOU NEED GoogleMaps SUPPORT
# #Crud, this shouldn't be necessary, but https://github.com/CocoaPods/CocoaPods/issues/5429
# post_install do |installer|
# installer.pods_project.targets.each do |target|
# target.build_configurations.each do |config|
# config.build_settings['CLANG_ENABLE_MODULES'] = 'NO'
# end
# end
# end
# when not using frameworks we can do this instead of including the source files in our project (1/4):
# pod 'react-native-maps', path: '../../'
# pod 'react-native-google-maps', path: '../../' # <~~ if you need GoogleMaps support on iOS
end
45 changes: 27 additions & 18 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
PODS:
- GoogleMaps (2.1.0):
- GoogleMaps/Maps (= 2.1.0)
- GoogleMaps/Base (2.1.0)
- GoogleMaps/Maps (2.1.0):
- GoogleMaps/Base (= 2.1.0)
- React/Core (0.35.0)
- React/RCTActionSheet (0.35.0):
- GoogleMaps (2.1.1):
- GoogleMaps/Maps (= 2.1.1)
- GoogleMaps/Base (2.1.1)
- GoogleMaps/Maps (2.1.1):
- GoogleMaps/Base
- React/Core (0.40.0):
- React/cxxreact
- React/yoga
- React/cxxreact (0.40.0):
- React/jschelpers
- React/jschelpers (0.40.0)
- React/RCTActionSheet (0.40.0):
- React/Core
- React/RCTGeolocation (0.35.0):
- React/RCTAnimation (0.40.0):
- React/Core
- React/RCTImage (0.35.0):
- React/RCTGeolocation (0.40.0):
- React/Core
- React/RCTImage (0.40.0):
- React/Core
- React/RCTNetwork
- React/RCTLinkingIOS (0.35.0):
- React/RCTLinkingIOS (0.40.0):
- React/Core
- React/RCTNetwork (0.35.0):
- React/RCTNetwork (0.40.0):
- React/Core
- React/RCTSettings (0.35.0):
- React/RCTSettings (0.40.0):
- React/Core
- React/RCTText (0.35.0):
- React/RCTText (0.40.0):
- React/Core
- React/RCTVibration (0.35.0):
- React/RCTVibration (0.40.0):
- React/Core
- React/RCTWebSocket (0.35.0):
- React/RCTWebSocket (0.40.0):
- React/Core
- React/yoga (0.40.0)

DEPENDENCIES:
- GoogleMaps
- React/Core (from `../node_modules/react-native`)
- React/RCTActionSheet (from `../node_modules/react-native`)
- React/RCTAnimation (from `../node_modules/react-native`)
- React/RCTGeolocation (from `../node_modules/react-native`)
- React/RCTImage (from `../node_modules/react-native`)
- React/RCTLinkingIOS (from `../node_modules/react-native`)
Expand All @@ -43,9 +52,9 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native"

SPEC CHECKSUMS:
GoogleMaps: 06589b9a38097bce0cd6e90f0fd9b5e4b4a9344c
React: d80af5410aa500d0cb1bce2cc4493a584cf2ec92
GoogleMaps: a5b5bbe47734e2443bde781a6aa64e69fdb6d785
React: 6dfb2f72edb1d74a800127ae157af038646673ce

PODFILE CHECKSUM: be65689c848eff5d4099a483239b72acab62f6a4
PODFILE CHECKSUM: ffbc20bd08f662256d501d07a70e77862684f702

COCOAPODS: 1.1.1
6 changes: 3 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"dev": "concurrently 'npm run watch' 'npm run packager'"
},
"dependencies": {
"react": "^15.3.1",
"react-native": "^0.35.0",
"react-native-maps": "../"
"react": "~15.4.1",
"react-native": "^0.40.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.40 hasn't been published yet so this doesn't actually work yet but it will soon (I tested with github:facebook/react-native#0.40-stable)

"react-native-maps": "file:../"
},
"devDependencies": {
"concurrently": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGMSMarker.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

#import <GoogleMaps/GoogleMaps.h>
#import "UIView+React.h"
#import <React/UIView+React.h>

@class AIRGoogleMapMarker;

Expand Down
4 changes: 2 additions & 2 deletions ios/AirGoogleMaps/AIRGoogleMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
//

#import <UIKit/UIKit.h>
#import "RCTComponent.h"
#import <React/RCTComponent.h>
#import <React/RCTConvert+MapKit.h>
#import <GoogleMaps/GoogleMaps.h>
#import <MapKit/MapKit.h>
#import "RCTConvert+MapKit.h"
#import "AIRGMSMarker.h"

@interface AIRGoogleMap : GMSMapView
Expand Down
4 changes: 2 additions & 2 deletions ios/AirGoogleMaps/AIRGoogleMap.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#import "AIRGoogleMapUrlTile.h"
#import <GoogleMaps/GoogleMaps.h>
#import <MapKit/MapKit.h>
#import "RCTConvert+MapKit.h"
#import "UIView+React.h"
#import <React/RCTConvert+MapKit.h>
#import <React/UIView+React.h>

id regionAsJSON(MKCoordinateRegion region) {
return @{
Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapCallout.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <UIKit/UIKit.h>
#import "RCTView.h"
#import <React/RCTView.h>

@interface AIRGoogleMapCallout : UIView
@property (nonatomic, assign) BOOL tooltip;
Expand Down
6 changes: 3 additions & 3 deletions ios/AirGoogleMaps/AIRGoogleMapCallout.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//

#import "AIRGoogleMapCallout.h"
#import "RCTUtils.h"
#import "RCTView.h"
#import "RCTBridge.h"
#import <React/RCTUtils.h>
#import <React/RCTView.h>
#import <React/RCTBridge.h>

@implementation AIRGoogleMapCallout
@end
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Gil Birman on 9/6/16.
//
//
#import "RCTViewManager.h"
#import <React/RCTViewManager.h>

@interface AIRGoogleMapCalloutManager : RCTViewManager

Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "AIRGoogleMapCalloutManager.h"
#import "AIRGoogleMapCallout.h"
#import "RCTView.h"
#import <React/RCTView.h>

@implementation AIRGoogleMapCalloutManager
RCT_EXPORT_MODULE()
Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapCircle.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#import <UIKit/UIKit.h>
#import "AIRGoogleMapCircle.h"
#import <GoogleMaps/GoogleMaps.h>
#import "RCTUtils.h"
#import <React/RCTUtils.h>

@implementation AIRGoogleMapCircle

Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapCircleManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Created by Nick Italiano on 10/24/16.
//

#import "RCTViewManager.h"
#import <React/RCTViewManager.h>

@interface AIRGoogleMapCircleManager : RCTViewManager

Expand Down
4 changes: 2 additions & 2 deletions ios/AirGoogleMaps/AIRGoogleMapCircleManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#import "AIRGoogleMapCircleManager.h"
#import "AIRGoogleMapCircle.h"
#import "RCTBridge.h"
#import "UIView+React.h"
#import <React/RCTBridge.h>
#import <React/UIView+React.h>

@interface AIRGoogleMapCircleManager()

Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Gil Birman on 9/1/16.
//

#import "RCTViewManager.h"
#import <React/RCTViewManager.h>

@interface AIRGoogleMapManager : RCTViewManager

Expand Down
18 changes: 9 additions & 9 deletions ios/AirGoogleMaps/AIRGoogleMapManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@


#import "AIRGoogleMapManager.h"
#import "RCTViewManager.h"
#import "RCTBridge.h"
#import "RCTUIManager.h"
#import "RCTConvert+CoreLocation.h"
#import "RCTConvert+MapKit.h"
#import <React/RCTViewManager.h>
#import <React/RCTBridge.h>
#import <React/RCTUIManager.h>
#import <React/RCTConvert+CoreLocation.h>
#import <React/RCTConvert+MapKit.h>
#import <React/RCTEventDispatcher.h>
#import <React/RCTViewManager.h>
#import <React/RCTConvert.h>
#import <React/UIView+React.h>
#import "RCTConvert+GMSMapViewType.h"
#import "RCTEventDispatcher.h"
#import "AIRGoogleMap.h"
#import "UIView+React.h"
#import "AIRMapMarker.h"
#import "RCTViewManager.h"
#import "RCTConvert.h"
#import "AIRMapPolyline.h"
#import "AIRMapPolygon.h"
#import "AIRMapCircle.h"
Expand Down
2 changes: 1 addition & 1 deletion ios/AirGoogleMaps/AIRGoogleMapMarker.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//

#import <GoogleMaps/GoogleMaps.h>
#import <React/RCTBridge.h>
#import "AIRGMSMarker.h"
#import "RCTBridge.h"
#import "AIRGoogleMap.h"
#import "AIRGoogleMapCallout.h"

Expand Down
Loading