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

…RN 0.40 React Native 0.40 (coming soon) changes the way its iOS headers should be imported. The headers are now under a directory called "React" that is in the compiler's include path, hence the new import style. On the JS side, RN 0.40 now peer-depends on React 15.4.x which moved SyntheticEvent from `react/lib` to deep inside `react-native`, so update that import as well. Test Plan: Follow the setup instructions (https://github.com/airbnb/react-native-maps/blob/master/docs/examples-setup.md) and run the explorer app (notably verify that it compiles).
react-native-maps · Jan 5, 2017 · d274eb4 · d274eb4
1 parent 1e71a21
commit d274eb4
Show file tree

Hide file tree

Showing 58 changed files with 146 additions and 148 deletions.
diff --git a/example/examples/EventListener.js b/example/examples/EventListener.js
@@ -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';
 

diff --git a/example/ios/AirMapsExplorer/AppDelegate.m b/example/ios/AirMapsExplorer/AppDelegate.m
@@ -9,7 +9,7 @@
 
 #import "AppDelegate.h"
 
-#import "RCTRootView.h"
+#import <React/RCTRootView.h>
 
 #import <GoogleMaps/GoogleMaps.h>
 

diff --git a/example/ios/AirMapsExplorerTests/AirMapsExplorerTests.m b/example/ios/AirMapsExplorerTests/AirMapsExplorerTests.m
@@ -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!"

diff --git a/example/package.json b/example/package.json
@@ -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",
+    "react-native-maps": "file:../"
   },
   "devDependencies": {
     "concurrently": "^2.2.0",

diff --git a/ios/AirGoogleMaps/AIRGMSMarker.h b/ios/AirGoogleMaps/AIRGMSMarker.h
@@ -6,7 +6,7 @@
 //
 
 #import <GoogleMaps/GoogleMaps.h>
-#import "UIView+React.h"
+#import <React/UIView+React.h>
 
 @class AIRGoogleMapMarker;
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMap.h b/ios/AirGoogleMaps/AIRGoogleMap.h
@@ -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

diff --git a/ios/AirGoogleMaps/AIRGoogleMap.m b/ios/AirGoogleMaps/AIRGoogleMap.m
@@ -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 @{

diff --git a/ios/AirGoogleMaps/AIRGoogleMapCallout.h b/ios/AirGoogleMaps/AIRGoogleMapCallout.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "RCTView.h"
+#import <React/RCTView.h>
 
 @interface AIRGoogleMapCallout : UIView
 @property (nonatomic, assign) BOOL tooltip;

diff --git a/ios/AirGoogleMaps/AIRGoogleMapCallout.m b/ios/AirGoogleMaps/AIRGoogleMapCallout.m
@@ -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
diff --git a/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h b/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h
@@ -5,7 +5,7 @@
 //  Created by Gil Birman on 9/6/16.
 //
 //
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapCalloutManager : RCTViewManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m b/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m
@@ -8,7 +8,7 @@
 
 #import "AIRGoogleMapCalloutManager.h"
 #import "AIRGoogleMapCallout.h"
-#import "RCTView.h"
+#import <React/RCTView.h>
 
 @implementation AIRGoogleMapCalloutManager
 RCT_EXPORT_MODULE()

diff --git a/ios/AirGoogleMaps/AIRGoogleMapCircle.m b/ios/AirGoogleMaps/AIRGoogleMapCircle.m
@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "AIRGoogleMapCircle.h"
 #import <GoogleMaps/GoogleMaps.h>
-#import "RCTUtils.h"
+#import <React/RCTUtils.h>
 
 @implementation AIRGoogleMapCircle
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapCircleManager.h b/ios/AirGoogleMaps/AIRGoogleMapCircleManager.h
@@ -4,7 +4,7 @@
 //  Created by Nick Italiano on 10/24/16.
 //
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapCircleManager : RCTViewManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapCircleManager.m b/ios/AirGoogleMaps/AIRGoogleMapCircleManager.m
@@ -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()
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapManager.h b/ios/AirGoogleMaps/AIRGoogleMapManager.h
@@ -5,7 +5,7 @@
 //  Created by Gil Birman on 9/1/16.
 //
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapManager : RCTViewManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapManager.m b/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -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"

diff --git a/ios/AirGoogleMaps/AIRGoogleMapMarker.h b/ios/AirGoogleMaps/AIRGoogleMapMarker.h
@@ -6,8 +6,8 @@
 //
 
 #import <GoogleMaps/GoogleMaps.h>
+#import <React/RCTBridge.h>
 #import "AIRGMSMarker.h"
-#import "RCTBridge.h"
 #import "AIRGoogleMap.h"
 #import "AIRGoogleMapCallout.h"
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapMarker.m b/ios/AirGoogleMaps/AIRGoogleMapMarker.m
@@ -7,10 +7,10 @@
 
 #import "AIRGoogleMapMarker.h"
 #import <GoogleMaps/GoogleMaps.h>
+#import <React/RCTImageLoader.h>
+#import <React/RCTUtils.h>
 #import "AIRGMSMarker.h"
 #import "AIRGoogleMapCallout.h"
-#import "RCTImageLoader.h"
-#import "RCTUtils.h"
 #import "DummyView.h"
 
 CGRect unionRect(CGRect a, CGRect b) {
@@ -186,14 +186,14 @@ - (void)setImageSrc:(NSString *)imageSrc
     if (_iconImageView) [_iconImageView removeFromSuperview];
     return;
   }
-  
+
   if (!_iconImageView) {
     // prevent glitch with marker (cf. https://github.com/airbnb/react-native-maps/issues/738)
     UIImageView *empyImageView = [[UIImageView alloc] init];
     _iconImageView = empyImageView;
     [self iconViewInsertSubview:_iconImageView atIndex:0];
   }
-  
+
   _reloadImageCancellationBlock = [_bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
                                                                           size:self.bounds.size
                                                                          scale:RCTScreenScale()

diff --git a/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.h b/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.h
@@ -5,7 +5,7 @@
 //  Created by Gil Birman on 9/2/16.
 //
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapMarkerManager : RCTViewManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m b/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m
@@ -8,8 +8,8 @@
 #import "AIRGoogleMapMarkerManager.h"
 #import "AIRGoogleMapMarker.h"
 #import <MapKit/MapKit.h>
-#import "RCTConvert+MapKit.h"
-#import "RCTUIManager.h"
+#import <React/RCTConvert+MapKit.h>
+#import <React/RCTUIManager.h>
 
 @implementation AIRGoogleMapMarkerManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.h b/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.h
@@ -4,7 +4,7 @@
 //  Created by Nick Italiano on 10/22/16.
 //
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapPolygonManager : RCTViewManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m b/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m
@@ -5,13 +5,13 @@
 //
 #import "AIRGoogleMapPolygonManager.h"
 
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTConvert+CoreLocation.h"
+#import <React/RCTBridge.h>
+#import <React/RCTConvert.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTViewManager.h>
+#import <React/UIView+React.h>
 #import "RCTConvert+MoreMapKit.h"
-#import "RCTEventDispatcher.h"
-#import "UIView+React.h"
-#import "RCTViewManager.h"
 #import "AIRGoogleMapPolygon.h"
 
 @interface AIRGoogleMapPolygonManager()

diff --git a/ios/AirGoogleMaps/AIRGoogleMapPolyline.m b/ios/AirGoogleMaps/AIRGoogleMapPolyline.m
@@ -9,7 +9,7 @@
 #import "AIRGoogleMapMarker.h"
 #import "AIRGoogleMapMarkerManager.h"
 #import <GoogleMaps/GoogleMaps.h>
-#import "RCTUtils.h"
+#import <React/RCTUtils.h>
 
 @implementation AIRGoogleMapPolyline
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.h b/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.h
@@ -4,7 +4,7 @@
 //  Created by Nick Italiano on 10/22/16.
 //
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapPolylineManager : RCTViewManager
 

diff --git a/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m b/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m
@@ -6,13 +6,13 @@
 
 #import "AIRGoogleMapPolylineManager.h"
 
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTConvert+CoreLocation.h"
+#import <React/RCTBridge.h>
+#import <React/RCTConvert.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTViewManager.h>
+#import <React/UIView+React.h>
 #import "RCTConvert+MoreMapKit.h"
-#import "RCTEventDispatcher.h"
-#import "UIView+React.h"
-#import "RCTViewManager.h"
 #import "AIRGoogleMapPolyline.h"
 
 @interface AIRGoogleMapPolylineManager()

diff --git a/ios/AirGoogleMaps/AIRGoogleMapUrlTileManager.h b/ios/AirGoogleMaps/AIRGoogleMapUrlTileManager.h
@@ -4,7 +4,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapUrlTileManager : RCTViewManager
 @end
diff --git a/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h b/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h
@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 #import <GoogleMaps/GoogleMaps.h>
-#import "RCTConvert.h"
+#import <React/RCTConvert.h>
 
 @interface RCTConvert (GMSMapViewType)
 

diff --git a/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m b/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
@@ -6,7 +6,7 @@
 
 #import "RCTConvert+GMSMapViewType.h"
 #import <GoogleMaps/GoogleMaps.h>
-#import "RCTConvert.h"
+#import <React/RCTConvert.h>
 
 @implementation RCTConvert (GMSMapViewType)
   RCT_ENUM_CONVERTER(GMSMapViewType,

diff --git a/ios/AirMaps/AIRMap.h b/ios/AirMaps/AIRMap.h
@@ -10,8 +10,8 @@
 #import <MapKit/MapKit.h>
 #import <UIKit/UIKit.h>
 
-#import "RCTConvert+MapKit.h"
-#import "RCTComponent.h"
+#import <React/RCTConvert+MapKit.h>
+#import <React/RCTComponent.h>
 #import "SMCalloutView.h"
 
 extern const CLLocationDegrees AIRMapDefaultSpan;

diff --git a/ios/AirMaps/AIRMap.m b/ios/AirMaps/AIRMap.m
@@ -9,9 +9,9 @@
 
 #import "AIRMap.h"
 
-#import "RCTEventDispatcher.h"
+#import <React/RCTEventDispatcher.h>
+#import <React/UIView+React.h>
 #import "AIRMapMarker.h"
-#import "UIView+React.h"
 #import "AIRMapPolyline.h"
 #import "AIRMapPolygon.h"
 #import "AIRMapCircle.h"

diff --git a/ios/AirMaps/AIRMapCallout.h b/ios/AirMaps/AIRMapCallout.h
@@ -4,7 +4,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "RCTView.h"
+#import <React/RCTView.h>
 
 
 @interface AIRMapCallout : RCTView

diff --git a/ios/AirMaps/AIRMapCalloutManager.h b/ios/AirMaps/AIRMapCalloutManager.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 
 @interface AIRMapCalloutManager : RCTViewManager