From b23ca3dfbf0e27e459d8ab3db371a9f65649a998 Mon Sep 17 00:00:00 2001
From: Felipe Lima <felipe.lima@gmail.com>
Date: Thu, 14 Jul 2016 13:28:50 -0700
Subject: [PATCH] Fixes example JS code for RN 30 compatibility

Also bump to RN to 30-rc
---
 android/lib/build.gradle                               |  6 +++---
 .../com/airbnb/android/react/maps/AirMapMarker.java    | 10 +++++-----
 example/examples/AnimatedPriceMarker.js                |  6 ++++--
 example/examples/PanController.js                      |  5 +++--
 example/package.json                                   |  2 +-
 package.json                                           |  6 +++---
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index c42dddd08..aa9cc2b6f 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -16,7 +16,7 @@ android {
 }
 
 dependencies {
-  compile 'com.facebook.react:react-native:0.29.0'
-  compile "com.google.android.gms:play-services-base:8.4.0"
-  compile 'com.google.android.gms:play-services-maps:8.4.0'
+  compile 'com.facebook.react:react-native:0.30.0-rc.0'
+  compile "com.google.android.gms:play-services-base:9.2.0"
+  compile 'com.google.android.gms:play-services-maps:9.2.0'
 }
diff --git a/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java b/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
index 51e381613..dbc835f1d 100644
--- a/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
+++ b/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
@@ -67,7 +67,7 @@ public class AirMapMarker extends AirMapFeature {
 
     private boolean hasCustomMarkerView = false;
 
-    private final DraweeHolder mLogoHolder;
+    private final DraweeHolder<?> logoHolder;
     private DataSource<CloseableReference<CloseableImage>> dataSource;
     private final ControllerListener<ImageInfo> mLogoControllerListener =
             new BaseControllerListener<ImageInfo>() {
@@ -104,8 +104,8 @@ public void onFinalImageSet(
     public AirMapMarker(Context context) {
         super(context);
         this.context = context;
-        mLogoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
-        mLogoHolder.onAttach();
+        logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
+        logoHolder.onAttach();
     }
 
     private GenericDraweeHierarchy createDraweeHierarchy() {
@@ -203,9 +203,9 @@ public void setImage(String uri) {
             DraweeController controller = Fresco.newDraweeControllerBuilder()
                     .setImageRequest(imageRequest)
                     .setControllerListener(mLogoControllerListener)
-                    .setOldController(mLogoHolder.getController())
+                    .setOldController(logoHolder.getController())
                     .build();
-            mLogoHolder.setController(controller);
+            logoHolder.setController(controller);
         } else {
             iconBitmapDescriptor = getBitmapDescriptorByName(uri);
             update();
diff --git a/example/examples/AnimatedPriceMarker.js b/example/examples/AnimatedPriceMarker.js
index 713dd97fc..40047cf48 100644
--- a/example/examples/AnimatedPriceMarker.js
+++ b/example/examples/AnimatedPriceMarker.js
@@ -1,13 +1,15 @@
 var React = require('react');
 var ReactNative = require('react-native');
 var {
-  StyleSheet,
   PropTypes,
+} = React;
+
+var {
+  StyleSheet,
   View,
   Text,
   Animated,
 } = ReactNative;
-var PropTypes = require('ReactPropTypes');
 
 const PriceMarker = ({ amount, selected, style }) => {
 
diff --git a/example/examples/PanController.js b/example/examples/PanController.js
index 036b4ecc7..a5338fa74 100644
--- a/example/examples/PanController.js
+++ b/example/examples/PanController.js
@@ -1,12 +1,13 @@
 var React = require('react');
 var ReactNative = require('react-native');
+var {
+  PropTypes,
+} = React;
 var {
   View,
   Animated,
-  PropTypes,
   PanResponder,
 } = ReactNative;
-var PropTypes = require('ReactPropTypes');
 
 var ModePropType = PropTypes.oneOf(["decay", "snap", "spring-origin"]);
 var OvershootPropType = PropTypes.oneOf(["spring", "clamp"]);
diff --git a/example/package.json b/example/package.json
index 2be625d5d..53766dbca 100644
--- a/example/package.json
+++ b/example/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "react": "15.2.0",
-    "react-native": "0.29.0",
+    "react-native": "^0.30.0-rc",
     "react-native-maps": "../"
   }
 }
diff --git a/package.json b/package.json
index 4a65565e3..ab5775d9a 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
     "mapkit"
   ],
   "dependencies": {
-    "react": "*",
-    "react-native": "*"
+    "react": "15.2.0",
+    "react-native": "^0.30.0-rc"
   },
   "devDependencies": {
     "react": "15.2.0",
-    "react-native": "0.29.0"
+    "react-native": "^0.30.0-rc"
   }
 }