Skip to content

Commit 76b4f4d

Browse files
authored
Upgrade to rn 0.38 (microsoft#624)
* upgrade to RN 0.38
1 parent 2431cb8 commit 76b4f4d

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

Examples/CodePushDemoApp/.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
# Ignore unexpected extra @providesModule
1919
.*/node_modules/commoner/test/source/widget/share.js
20+
.*/node_modules/.*/node_modules/fbjs/.*
2021

2122
# Ignore duplicate module providers
2223
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root

Examples/CodePushDemoApp/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ npm-debug.log
3838
buck-out/
3939
\.buckd/
4040
android/app/libs
41-
android/keystores/debug.keystore
41+
*.keystore

Examples/CodePushDemoApp/android/app/src/main/java/com/codepushdemoapp/MainApplication.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import com.facebook.react.ReactNativeHost;
99
import com.facebook.react.ReactPackage;
1010
import com.facebook.react.shell.MainReactPackage;
11+
import com.facebook.soloader.SoLoader;
1112

1213
import com.microsoft.codepush.react.CodePush;
13-
1414
import java.util.Arrays;
1515
import java.util.List;
1616

@@ -20,8 +20,7 @@ public class MainApplication extends Application implements ReactApplication {
2020
@Override
2121
protected String getJSBundleFile() {
2222
return CodePush.getJSBundleFile();
23-
}
24-
23+
}
2524
@Override
2625
protected boolean getUseDeveloperSupport() {
2726
return BuildConfig.DEBUG;
@@ -31,13 +30,18 @@ protected boolean getUseDeveloperSupport() {
3130
protected List<ReactPackage> getPackages() {
3231
return Arrays.<ReactPackage>asList(
3332
new MainReactPackage(),
34-
new CodePush("deployment-key-here", MainApplication.this, BuildConfig.DEBUG)
35-
);
33+
new CodePush("deployment-key-here", MainApplication.this, BuildConfig.DEBUG) );
3634
}
3735
};
3836

3937
@Override
4038
public ReactNativeHost getReactNativeHost() {
41-
return mReactNativeHost;
39+
return mReactNativeHost;
40+
}
41+
42+
@Override
43+
public void onCreate() {
44+
super.onCreate();
45+
SoLoader.init(this, /* native exopackage */ false);
4246
}
4347
}

Examples/CodePushDemoApp/iOS/CodePushDemoApp/Info.plist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<key>NSLocationWhenInUseUsageDescription</key>
4040
<string></string>
4141
<key>NSAppTransportSecurity</key>
42-
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
4342
<dict>
4443
<key>NSExceptionDomains</key>
4544
<dict>

Examples/CodePushDemoApp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
"dependencies": {
99
"babel-preset-react-native-stage-0": "1.0.1",
10-
"react": "15.3.1",
11-
"react-native": "0.37.0",
10+
"react": "15.4.0",
11+
"react-native": "0.38.0",
1212
"react-native-code-push": "file:../../"
1313
}
1414
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ We try our best to maintain backwards compatability of our plugin with previous
5353
| v0.29-v0.30 | v1.13.0+ *(RN refactored native hosting code)* |
5454
| v0.31-v0.33 | v1.14.6+ *(RN refactored native hosting code)* |
5555
| v0.34-v0.35 | v1.15.0+ *(RN refactored native hosting code)* |
56-
| v0.36-v0.37 | v1.16.0+ *(RN refactored resume handler)* |
57-
| 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.
56+
| v0.36-v0.38 | v1.16.0+ *(RN refactored resume handler)* |
57+
| 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.
5858

5959
## Supported Components
6060

0 commit comments

Comments
 (0)