Revert "Merge pull request react-native-maps#923 from exponent/react-native-40"

This reverts commit fcc2995, reversing
changes made to 1e71a21.

Author: Spike Brehm

example/examples/EventListener.js

@@ -1,13 +1,12 @@
 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';
 

example/ios/AirMapsExplorer.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 		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 */; };
@@ -49,7 +50,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 */; };
-		A622B8115793E41C70169A8B /* libPods-AirMapsExplorer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */; };
+		C9315A21AD5A149EB5B40F29 /* Pods_AirMapsExplorer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24EB66BA0860A4DCD4CA3D77 /* Pods_AirMapsExplorer.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -65,7 +66,6 @@
 /* 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>"; };
@@ -116,6 +116,7 @@
 		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>"; };
@@ -146,12 +147,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 */
@@ -170,7 +171,7 @@
 				21E6570E1D77591F00B75EE5 /* MapKit.framework in Frameworks */,
 				21E6570C1D77591A00B75EE5 /* MobileCoreServices.framework in Frameworks */,
 				21E6570A1D77591400B75EE5 /* SystemConfiguration.framework in Frameworks */,
-				A622B8115793E41C70169A8B /* libPods-AirMapsExplorer.a in Frameworks */,
+				3E4E0B5921E01BC4043FD8CD /* Pods_AirMapsExplorer.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -189,7 +190,7 @@
 				21E6570D1D77591F00B75EE5 /* MapKit.framework */,
 				21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */,
 				21E657091D77591400B75EE5 /* SystemConfiguration.framework */,
-				0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */,
+				3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

example/ios/AirMapsExplorer/AppDelegate.m

@@ -9,7 +9,7 @@
 
 #import "AppDelegate.h"
 
-#import <React/RCTRootView.h>
+#import "RCTRootView.h"
 
 #import <GoogleMaps/GoogleMaps.h>
 

example/ios/AirMapsExplorerTests/AirMapsExplorerTests.m

@@ -10,8 +10,8 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTLog.h>
-#import <React/RCTRootView.h>
+#import "RCTLog.h"
+#import "RCTRootView.h"
 
 #define TIMEOUT_SECONDS 240
 #define TEXT_TO_LOOK_FOR @"Welcome to React Native!"

example/ios/Podfile

@@ -1,14 +1,18 @@
-# You Podfile should look similar to this file. React Native currently does not support use_frameworks!
+# 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)
+
 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',
@@ -19,9 +23,29 @@ target 'AirMapsExplorer' do
     'RCTWebSocket'
   ]
 
-  pod 'GoogleMaps'  # <~~ remove this line if you do not want to support GoogleMaps on iOS
-
 # 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
+# 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

example/ios/Podfile.lock

@@ -1,43 +1,34 @@
 PODS:
-  - 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):
+  - 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):
     - React/Core
-  - React/RCTAnimation (0.40.0):
+  - React/RCTGeolocation (0.35.0):
     - React/Core
-  - React/RCTGeolocation (0.40.0):
-    - React/Core
-  - React/RCTImage (0.40.0):
+  - React/RCTImage (0.35.0):
     - React/Core
     - React/RCTNetwork
-  - React/RCTLinkingIOS (0.40.0):
+  - React/RCTLinkingIOS (0.35.0):
     - React/Core
-  - React/RCTNetwork (0.40.0):
+  - React/RCTNetwork (0.35.0):
     - React/Core
-  - React/RCTSettings (0.40.0):
+  - React/RCTSettings (0.35.0):
     - React/Core
-  - React/RCTText (0.40.0):
+  - React/RCTText (0.35.0):
     - React/Core
-  - React/RCTVibration (0.40.0):
+  - React/RCTVibration (0.35.0):
     - React/Core
-  - React/RCTWebSocket (0.40.0):
+  - React/RCTWebSocket (0.35.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`)
@@ -52,9 +43,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native"
 
 SPEC CHECKSUMS:
-  GoogleMaps: a5b5bbe47734e2443bde781a6aa64e69fdb6d785
-  React: 6dfb2f72edb1d74a800127ae157af038646673ce
+  GoogleMaps: 06589b9a38097bce0cd6e90f0fd9b5e4b4a9344c
+  React: d80af5410aa500d0cb1bce2cc4493a584cf2ec92
 
-PODFILE CHECKSUM: ffbc20bd08f662256d501d07a70e77862684f702
+PODFILE CHECKSUM: be65689c848eff5d4099a483239b72acab62f6a4
 
 COCOAPODS: 1.1.1

example/package.json

@@ -9,9 +9,9 @@
     "dev": "concurrently 'npm run watch' 'npm run packager'"
   },
   "dependencies": {
-    "react": "~15.4.1",
-    "react-native": "^0.40.0",
-    "react-native-maps": "file:../"
+    "react": "^15.3.1",
+    "react-native": "^0.35.0",
+    "react-native-maps": "../"
   },
   "devDependencies": {
     "concurrently": "^2.2.0",

ios/AirGoogleMaps/AIRGMSMarker.h

@@ -6,7 +6,7 @@
 //
 
 #import <GoogleMaps/GoogleMaps.h>
-#import <React/UIView+React.h>
+#import "UIView+React.h"
 
 @class AIRGoogleMapMarker;
 

ios/AirGoogleMaps/AIRGoogleMap.h

@@ -6,10 +6,10 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <React/RCTComponent.h>
-#import <React/RCTConvert+MapKit.h>
+#import "RCTComponent.h"
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
+#import "RCTConvert+MapKit.h"
 #import "AIRGMSMarker.h"
 
 @interface AIRGoogleMap : GMSMapView

ios/AirGoogleMaps/AIRGoogleMap.m

@@ -13,8 +13,8 @@
 #import "AIRGoogleMapUrlTile.h"
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
-#import <React/RCTConvert+MapKit.h>
-#import <React/UIView+React.h>
+#import "RCTConvert+MapKit.h"
+#import "UIView+React.h"
 
 id regionAsJSON(MKCoordinateRegion region) {
   return @{