diff --git a/Examples/CodePushDemoApp/.flowconfig b/Examples/CodePushDemoApp/.flowconfig index 3b261e2..5c5a16d 100644 --- a/Examples/CodePushDemoApp/.flowconfig +++ b/Examples/CodePushDemoApp/.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/Examples/CodePushDemoApp/.gitignore b/Examples/CodePushDemoApp/.gitignore index eb1535e..73359e1 100644 --- a/Examples/CodePushDemoApp/.gitignore +++ b/Examples/CodePushDemoApp/.gitignore @@ -38,4 +38,4 @@ npm-debug.log buck-out/ \.buckd/ android/app/libs -android/keystores/debug.keystore +*.keystore diff --git a/Examples/CodePushDemoApp/android/app/src/main/java/com/codepushdemoapp/MainApplication.java b/Examples/CodePushDemoApp/android/app/src/main/java/com/codepushdemoapp/MainApplication.java index d6da920..b432fd0 100644 --- a/Examples/CodePushDemoApp/android/app/src/main/java/com/codepushdemoapp/MainApplication.java +++ b/Examples/CodePushDemoApp/android/app/src/main/java/com/codepushdemoapp/MainApplication.java @@ -8,9 +8,9 @@ import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; +import com.facebook.soloader.SoLoader; import com.microsoft.codepush.react.CodePush; - import java.util.Arrays; import java.util.List; @@ -20,8 +20,7 @@ public class MainApplication extends Application implements ReactApplication { @Override protected String getJSBundleFile() { return CodePush.getJSBundleFile(); - } - + } @Override protected boolean getUseDeveloperSupport() { return BuildConfig.DEBUG; @@ -31,13 +30,18 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { return Arrays.asList( new MainReactPackage(), - new CodePush("deployment-key-here", MainApplication.this, BuildConfig.DEBUG) - ); + new CodePush("deployment-key-here", MainApplication.this, BuildConfig.DEBUG) ); } }; @Override public ReactNativeHost getReactNativeHost() { - return mReactNativeHost; + return mReactNativeHost; + } + + @Override + public void onCreate() { + super.onCreate(); + SoLoader.init(this, /* native exopackage */ false); } } diff --git a/Examples/CodePushDemoApp/iOS/CodePushDemoApp/Info.plist b/Examples/CodePushDemoApp/iOS/CodePushDemoApp/Info.plist index 876e639..0e9a57e 100644 --- a/Examples/CodePushDemoApp/iOS/CodePushDemoApp/Info.plist +++ b/Examples/CodePushDemoApp/iOS/CodePushDemoApp/Info.plist @@ -39,7 +39,6 @@ NSLocationWhenInUseUsageDescription NSAppTransportSecurity - NSExceptionDomains diff --git a/Examples/CodePushDemoApp/package.json b/Examples/CodePushDemoApp/package.json index 950fbca..e125e9f 100644 --- a/Examples/CodePushDemoApp/package.json +++ b/Examples/CodePushDemoApp/package.json @@ -7,8 +7,8 @@ }, "dependencies": { "babel-preset-react-native-stage-0": "1.0.1", - "react": "15.3.1", - "react-native": "0.37.0", + "react": "15.4.0", + "react-native": "0.38.0", "react-native-code-push": "file:../../" } } diff --git a/README.md b/README.md index 0b86932..d237fc7 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,8 @@ We try our best to maintain backwards compatability of our plugin with previous | v0.29-v0.30 | v1.13.0+ *(RN refactored native hosting code)* | | v0.31-v0.33 | v1.14.6+ *(RN refactored native hosting code)* | | v0.34-v0.35 | v1.15.0+ *(RN refactored native hosting code)* | -| v0.36-v0.37 | v1.16.0+ *(RN refactored resume handler)* | -| v0.38+ | TBD :) We work hard to respond to new RN releases, but they do occasionally break us. We will update this chart with each RN release, so that users can check to see what our "official" support is. +| v0.36-v0.38 | v1.16.0+ *(RN refactored resume handler)* | +| v0.39+ | TBD :) We work hard to respond to new RN releases, but they do occasionally break us. We will update this chart with each RN release, so that users can check to see what our "official" support is. ## Supported Components