Merge pull request #277 from DanielZlotin/master

Update react-native to 0.31.0

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -4,19 +4,22 @@ import android.app.Application;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.react.NavigationReactGateway;
 import com.reactnativenavigation.react.ReactGateway;
+import com.reactnativenavigation.react.ReactGatewayHost;
 
 import java.util.List;
 
-public abstract class NavigationApplication extends Application {
+public abstract class NavigationApplication extends Application implements ReactApplication {
 
     public static NavigationApplication instance;
 
-    private ReactGateway reactGateway;
+    private ReactGatewayHost reactGateway;
     private Handler handler;
 
     @Override
@@ -51,12 +54,9 @@ public abstract class NavigationApplication extends Application {
         // nothing
     }
 
-    public String getJsEntryFileName() {
-        return "index.android";
-    }
-
-    public String getBundleAssetName() {
-        return "index.android.bundle";
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        return reactGateway;
     }
 
     public abstract boolean isDebug();

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java

@@ -3,7 +3,6 @@ package com.reactnativenavigation.react;
 import android.app.Activity;
 import android.content.Intent;
 
-import com.facebook.react.LifecycleState;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
@@ -16,66 +15,54 @@ import com.reactnativenavigation.bridge.NavigationReactPackage;
 import java.util.ArrayList;
 import java.util.List;
 
-public class NavigationReactGateway implements ReactGateway, ReactInstanceManager.ReactInstanceEventListener {
+public class NavigationReactGateway extends ReactGatewayHost implements ReactInstanceManager.ReactInstanceEventListener {
 
     private OnJsDevReloadListener onJsDevReloadListener;
-    private ReactInstanceManager reactInstanceManager;
     private NavigationReactEventEmitter reactEventEmitter;
 
     public NavigationReactGateway() {
-        reactInstanceManager = createReactInstanceManager();
+        super(NavigationApplication.instance);
     }
 
     @Override
     public void startReactContextOnceInBackgroundAndExecuteJS() {
-        if (reactInstanceManager == null) {
-            reactInstanceManager = createReactInstanceManager();
-        }
-
-        if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
-            reactInstanceManager.createReactContextInBackground();
-        }
+        getReactInstanceManager().createReactContextInBackground();
     }
 
     public boolean isInitialized() {
-        return reactInstanceManager != null && reactInstanceManager.getCurrentReactContext() != null;
+        return hasInstance() && getReactInstanceManager().getCurrentReactContext() != null;
     }
 
     public ReactContext getReactContext() {
-        return reactInstanceManager.getCurrentReactContext();
+        return getReactInstanceManager().getCurrentReactContext();
     }
 
     public NavigationReactEventEmitter getReactEventEmitter() {
         return reactEventEmitter;
     }
 
-    public ReactInstanceManager getReactInstanceManager() {
-        return reactInstanceManager;
-    }
-
     public void onBackPressed() {
-        reactInstanceManager.onBackPressed();
+        getReactInstanceManager().onBackPressed();
     }
 
     public void onDestroyApp() {
-        reactInstanceManager.onHostDestroy();
-        reactInstanceManager.destroy();
-        reactInstanceManager.removeReactInstanceEventListener(this);
-        reactInstanceManager = null;
+        getReactInstanceManager().onHostDestroy();
+        getReactInstanceManager().removeReactInstanceEventListener(this);
+        clear();
     }
 
     public void onPauseActivity() {
-        reactInstanceManager.onHostPause();
+        getReactInstanceManager().onHostPause();
         onJsDevReloadListener = null;
     }
 
     public void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
         this.onJsDevReloadListener = onJsDevReloadListener;
-        reactInstanceManager.onHostResume(activity, defaultHardwareBackBtnHandler);
+        getReactInstanceManager().onHostResume(activity, defaultHardwareBackBtnHandler);
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        reactInstanceManager.onActivityResult(requestCode, resultCode, data);
+        getReactInstanceManager().onActivityResult(requestCode, resultCode, data);
     }
 
     private void replaceJsDevReloadListener(ReactInstanceManager manager) {
@@ -88,29 +75,26 @@ public class NavigationReactGateway implements ReactGateway, ReactInstanceManage
         }).replace();
     }
 
-    private ReactInstanceManager createReactInstanceManager() {
-        ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
-                .setApplication(NavigationApplication.instance)
-                .setJSMainModuleName(NavigationApplication.instance.getJsEntryFileName())
-                .setBundleAssetName(NavigationApplication.instance.getBundleAssetName())
-                .setUseDeveloperSupport(NavigationApplication.instance.isDebug())
-                .setInitialLifecycleState(LifecycleState.BEFORE_RESUME);
-
-        for (ReactPackage reactPackage : createReactPackages()) {
-            builder.addPackage(reactPackage);
-        }
-
-        ReactInstanceManager manager = builder.build();
-
+    @Override
+    protected ReactInstanceManager createReactInstanceManager() {
+        ReactInstanceManager manager = super.createReactInstanceManager();
         if (NavigationApplication.instance.isDebug()) {
             replaceJsDevReloadListener(manager);
         }
-
         manager.addReactInstanceEventListener(this);
-
         return manager;
     }
 
+    @Override
+    protected boolean getUseDeveloperSupport() {
+        return NavigationApplication.instance.isDebug();
+    }
+
+    @Override
+    protected List<ReactPackage> getPackages() {
+        return createReactPackages();
+    }
+
     private List<ReactPackage> createReactPackages() {
         List<ReactPackage> list = new ArrayList<>();
         list.add(new MainReactPackage());

android/app/src/main/java/com/reactnativenavigation/react/ReactGatewayHost.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.react;
+
+import android.app.Application;
+
+import com.facebook.react.ReactNativeHost;
+
+public abstract class ReactGatewayHost extends ReactNativeHost implements ReactGateway {
+    protected ReactGatewayHost(Application application) {
+        super(application);
+    }
+}

example-redux/.flowconfig

@@ -1,70 +1,28 @@
 [ignore]
 
 # We fork some components by platform.
-.*/*.web.js
 .*/*.android.js
 
-# Some modules have their own node_modules with overlap
-.*/node_modules/node-haste/.*
-
-# Ugh
-.*/node_modules/babel.*
-.*/node_modules/babylon.*
-.*/node_modules/invariant.*
-
-# Ignore react and fbjs where there are overlaps, but don't ignore
-# anything that react-native relies on
-.*/node_modules/fbjs/lib/Map.js
-.*/node_modules/fbjs/lib/fetch.js
-.*/node_modules/fbjs/lib/ExecutionEnvironment.js
-.*/node_modules/fbjs/lib/ErrorUtils.js
-
-# Flow has a built-in definition for the 'react' module which we prefer to use
-# over the currently-untyped source
-.*/node_modules/react/react.js
-.*/node_modules/react/lib/React.js
-.*/node_modules/react/lib/ReactDOM.js
-
-.*/__mocks__/.*
-.*/__tests__/.*
-
-.*/commoner/test/source/widget/share.js
-
-# Ignore commoner tests
-.*/node_modules/commoner/test/.*
-
-# See https://github.com/facebook/flow/issues/442
-.*/react-tools/node_modules/commoner/lib/reader.js
+# Ignore templates with `@flow` in header
+.*/local-cli/generator.*
 
-# Ignore jest
-.*/node_modules/jest-cli/.*
+# Ignore malformed json
+.*/node_modules/y18n/test/.*\.json
 
-# Ignore Website
-.*/website/.*
+# Ignore the website subdir
+<PROJECT_ROOT>/website/.*
 
-# Ignore generators
-.*/local-cli/generator.*
+# Ignore BUCK generated dirs
+<PROJECT_ROOT>/\.buckd/
 
-# Ignore BUCK generated folders
-.*\.buckd/
-
-.*/node_modules/is-my-json-valid/test/.*\.json
-.*/node_modules/iconv-lite/encodings/tables/.*\.json
-.*/node_modules/y18n/test/.*\.json
-.*/node_modules/spdx-license-ids/spdx-license-ids.json
-.*/node_modules/spdx-exceptions/index.json
-.*/node_modules/resolve/test/subdirs/node_modules/a/b/c/x.json
-.*/node_modules/resolve/lib/core.json
-.*/node_modules/jsonparse/samplejson/.*\.json
-.*/node_modules/json5/test/.*\.json
-.*/node_modules/ua-parser-js/test/.*\.json
-.*/node_modules/builtin-modules/builtin-modules.json
-.*/node_modules/binary-extensions/binary-extensions.json
-.*/node_modules/url-regex/tlds.json
-.*/node_modules/joi/.*\.json
-.*/node_modules/isemail/.*\.json
-.*/node_modules/tr46/.*\.json
+# Ignore unexpected extra @providesModule
+.*/node_modules/commoner/test/source/widget/share.js
 
+# Ignore duplicate module providers
+# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
+.*/Libraries/react-native/React.js
+.*/Libraries/react-native/ReactNative.js
+.*/node_modules/jest-runtime/build/__tests__/.*
 
 [include]
 
@@ -79,18 +37,22 @@ module.system=haste
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 
+experimental.strict_type_args=true
+
 munge_underscores=true
 
 module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\)$' -> 'RelativeImageStub'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-3]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-3]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-9]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-9]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
+unsafe.enable_getters_and_setters=true
+
 [version]
-0.23.0
+^0.29.0

example-redux/android/app/BUCK

@@ -5,7 +5,7 @@ import re
 # - install Buck
 # - `npm start` - to start the packager
 # - `cd android`
-# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
 # - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
 # - `buck install -r android/app` - compile, install and run application
 #

example-redux/android/app/build.gradle

@@ -55,7 +55,13 @@ import com.android.build.OutputFile
  *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
  *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
  *   // for example, you might want to remove it from here.
- *   inputExcludes: ["android/**", "ios/**"]
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"]
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
  * ]
  */
 
@@ -125,7 +131,6 @@ dependencies {
     compile "com.facebook.react:react-native:+"  // From node_modules
     debugCompile project(path: ':react-native-navigation', configuration: 'libraryDebug')
     releaseCompile project(path: ':react-native-navigation', configuration: 'libraryRelease')
-//    compile project(':react-native-navigation')
 }
 
 // Run this once to be able to run the application with BUCK
@@ -134,7 +139,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
   from configurations.compile
   into 'libs'
 }
-
-task runDebug(dependsOn: ['assembleDebug', 'installDebug']) << {
-    println 'FINISHED'
-}

example-redux/android/app/proguard-rules.pro

@@ -26,11 +26,14 @@
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
 
 # Do not strip any method/class that is annotated with @DoNotStrip
 -keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
 -keepclassmembers class * {
     @com.facebook.proguard.annotations.DoNotStrip *;
+    @com.facebook.common.internal.DoNotStrip *;
 }
 
 -keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
@@ -51,9 +54,9 @@
 
 -keepattributes Signature
 -keepattributes *Annotation*
--keep class com.squareup.okhttp.** { *; }
--keep interface com.squareup.okhttp.** { *; }
--dontwarn com.squareup.okhttp.**
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
 
 # okio
 

example-redux/android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".App"
+        android:name=".MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

example-redux/android/app/src/main/java/com/exampleredux/App.java → example-redux/android/app/src/main/java/com/exampleredux/MainApplication.java

@@ -1,22 +1,23 @@
 package com.exampleredux;
 
-import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.facebook.react.ReactPackage;
 import com.reactnativenavigation.NavigationApplication;
 
-import java.util.Collections;
 import java.util.List;
 
-public class App extends NavigationApplication {
+public class MainApplication extends NavigationApplication {
+
+
     @Override
     public boolean isDebug() {
         return BuildConfig.DEBUG;
     }
 
-    @NonNull
+    @Nullable
     @Override
     public List<ReactPackage> createAdditionalReactPackages() {
-        return Collections.emptyList();
+        return null;
     }
 }

example-redux/android/build.gradle

@@ -18,7 +18,7 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$projectDir/../../node_modules/react-native/android"
+            url "$rootDir/../node_modules/react-native/android"
         }
     }
 }

example-redux/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Tue Aug 16 15:10:42 IDT 2016
+#Sun Aug 28 15:34:43 IDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

example-redux/package.json

@@ -7,13 +7,13 @@
     "install:android": "pushd android && ./gradlew installDebug && popd"
   },
   "dependencies": {
-    "react-native": "0.25.1",
-    "react": "0.14.5",
+    "react-native-navigation": "file:../",
+    "react-native": "0.31.0",
+    "react": "15.2.1",
     "react-redux": "^4.0.6",
     "redux": "^3.0.5",
     "redux-thunk": "^1.0.3",
     "seamless-immutable": "^5.0.1",
-    "react-native-navigation": "file:../",
     "babel-preset-react-native-stage-0": "*"
   }
 }

package.json

@@ -26,8 +26,8 @@
     "release": "npm version prerelease && npm publish --tag next && npm view react-native-navigation dist-tags && git push"
   },
   "peerDependencies": {
-    "react-native": ">=0.25.1",
-    "react": ">=0.14.5"
+    "react-native": ">=0.31.0",
+    "react": ">=15.2.1"
   },
   "dependencies": {
     "react-native-controllers": "^2.0.0",
@@ -38,8 +38,8 @@
     "react-redux": "*"
   },
   "devDependencies": {
-    "react-native": "0.25.1",
-    "react": "0.14.5",
+    "react-native": "0.31.0",
+    "react": "15.2.1",
     "app-root-path": "^1.0.0",
     "babel-cli": "^6.8.0",
     "babel-core": "^6.8.0",