Merge pull request #31 from SushilShrestha/master

RCTBridgeModule conditional import
zhangtaii · Jan 9, 2018 · 726d9b8 · 726d9b8
2 parents 317f183 + fe89d28
commit 726d9b8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -21,5 +21,5 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile 'com.google.android.gms:play-services-location:8.4.0'
+	compile 'com.google.android.gms:play-services-places:+'
 }
diff --git a/android/src/main/java/com/reactlibrary/RNGooglePlacePickerPackage.java b/android/src/main/java/com/reactlibrary/RNGooglePlacePickerPackage.java
@@ -17,7 +17,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         return Arrays.<NativeModule>asList(new RNGooglePlacePickerModule(reactContext));
     }
 
-    @Override
+    //@Override
     public List<Class<? extends JavaScriptModule>> createJSModules() {
         return Collections.emptyList();
     }
@@ -26,4 +26,4 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Collections.emptyList();
     }
-}
+}
diff --git a/ios/RNGooglePlacePicker.h b/ios/RNGooglePlacePicker.h
@@ -1,5 +1,9 @@
-#import "RCTBridgeModule.h"
+#if __has_include(<React/RCTBridgeModule.h>)
+  #import <React/RCTBridgeModule.h>
+#else
+  #import "RCTBridgeModule.h"
+#endif
 
 @interface RNGooglePlacePicker : NSObject <RCTBridgeModule>
 
-@end
+@end