diff --git a/RnDiffApp/.flowconfig b/RnDiffApp/.flowconfig index 3b261e22da..5c5a16d11e 100644 --- a/RnDiffApp/.flowconfig +++ b/RnDiffApp/.flowconfig @@ -17,6 +17,7 @@ # Ignore unexpected extra @providesModule .*/node_modules/commoner/test/source/widget/share.js +.*/node_modules/.*/node_modules/fbjs/.* # 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 diff --git a/RnDiffApp/.gitignore b/RnDiffApp/.gitignore index eb1535e41e..73359e1a83 100644 --- a/RnDiffApp/.gitignore +++ b/RnDiffApp/.gitignore @@ -38,4 +38,4 @@ npm-debug.log buck-out/ \.buckd/ android/app/libs -android/keystores/debug.keystore +*.keystore diff --git a/RnDiffApp/android/app/src/main/java/com/rndiffapp/MainApplication.java b/RnDiffApp/android/app/src/main/java/com/rndiffapp/MainApplication.java index f9a1dafff8..55e3b57eff 100644 --- a/RnDiffApp/android/app/src/main/java/com/rndiffapp/MainApplication.java +++ b/RnDiffApp/android/app/src/main/java/com/rndiffapp/MainApplication.java @@ -8,6 +8,7 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; +import com.facebook.soloader.SoLoader; import java.util.Arrays; import java.util.List; @@ -30,6 +31,12 @@ protected List getPackages() { @Override public ReactNativeHost getReactNativeHost() { - return mReactNativeHost; + return mReactNativeHost; + } + + @Override + public void onCreate() { + super.onCreate(); + SoLoader.init(this, /* native exopackage */ false); } } diff --git a/RnDiffApp/package.json b/RnDiffApp/package.json index c3da58fd42..900f4516ec 100644 --- a/RnDiffApp/package.json +++ b/RnDiffApp/package.json @@ -7,17 +7,17 @@ "test": "jest" }, "dependencies": { - "react": "~15.3.1", - "react-native": "0.37.0" + "react": "~15.4.0-rc.4", + "react-native": "0.38.0" }, "devDependencies": { "babel-jest": "23.6.0", "babel-preset-react-native": "4.0.1", "jest": "23.6.0", "jest-react-native": "18.0.0", - "react-test-renderer": "~15.3.1" + "react-test-renderer": "~15.4.0-rc.4" }, "jest": { - "preset": "jest-react-native" + "preset": "react-native" } } \ No newline at end of file