react-native 0.56.0 & react-native-code-push 5.4.1

Author: lisong

.flowconfig

@@ -30,6 +30,19 @@ node_modules/react-native/flow-github/
 emoji=true
 
 module.system=haste
+module.system.haste.use_name_reducers=true
+# get basename
+module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
+# strip .js or .js.flow suffix
+module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
+# strip .ios suffix
+module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
+module.system.haste.paths.blacklist=.*/__tests__/.*
+module.system.haste.paths.blacklist=.*/__mocks__/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
 
 munge_underscores=true
 
@@ -51,4 +64,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.65.0
+^0.75.0

.gitignore

@@ -51,3 +51,6 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+
+# Bundle artifact
+*.jsbundle

App.js

@@ -106,7 +106,7 @@ class App extends Component<{}> {
           <Text style={styles.syncButton}>Press for dialog-driven sync</Text>
         </TouchableOpacity>
         {progressView}
-        <Image style={styles.image} resizeMode={Image.resizeMode.contain} source={require("./images/laptop_phone_howitworks.png")}/>
+        <Image style={styles.image} source={require("./images/laptop_phone_howitworks.png")}/>
         <TouchableOpacity onPress={this.toggleAllowRestart.bind(this)}>
           <Text style={styles.restartToggleButton}>Restart { this.state.restartAllowed ? "allowed" : "forbidden"}</Text>
         </TouchableOpacity>

README.md

@@ -5,15 +5,17 @@ fork from https://github.com/Microsoft/react-native-code-push examples
 # iOS eg.
 
 ```shell
-$ cd /path/to/code-push-demo-app
+$ git clone git@github.com:lisong/code-push-demo-app.git
+$ cd code-push-demo-app
 $ npm install
 $ open ios/CodePushDemoApp.xcodeproj
 ```
 
 # android eg.
 
 ```shell
-$ cd /path/to/code-push-demo-app
+$ git clone git@github.com:lisong/code-push-demo-app.git
+$ cd code-push-demo-app
 $ npm install
 $ cd android
 $ ./gradlew assembleRelease
@@ -23,10 +25,10 @@ $ cd app/build/outputs/apk #install app-release.apk into your phone
 # codepush 热更新
 
 ```shell
-$ code-push login http://api.code-push.com:8080 #登录code-push-server
+$ code-push login http://api.code-push.com #登录code-push-server
 $ code-push app add CodePushReactNativeDemo-ios ios react-native  #iOS版
 $ code-push app add CodePushReactNativeDemo-android android react-native #android版
-$ cd /path/to/code-push-demo-app
+$ cd code-push-demo-app
 $ npm install
 $ code-push release-react CodePushReactNativeDemo-ios ios -d Production #发布到code-push-server ios
 $ code-push release-react CodePushReactNativeDemo-android android -d Production #发布code-push-server android

__tests__/App.js

@@ -95,15 +95,15 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.codepushdemoapp"
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "2.1.0"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 20180818
+        versionName "5.6.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -149,7 +149,7 @@ android {
 dependencies {
     compile project(':react-native-code-push')
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:23.0.1"
+    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     compile "com.facebook.react:react-native:+"  // From node_modules
 }
 

android/app/build.gradle

@@ -15,56 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
-# Disabling obfuscation is useful if you collect stack traces from production crashes
-# (unless you are using a system that supports de-obfuscate the stack traces).
--dontobfuscate
-
-# React Native
-
-# Keep our interfaces so they can be used by other ProGuard rules.
-# 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 * {
-  void set*(***);
-  *** get*();
-}
-
--keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
--keep class * extends com.facebook.react.bridge.NativeModule { *; }
--keepclassmembers,includedescriptorclasses class * { native <methods>; }
--keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
--keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
--keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
-
--dontwarn com.facebook.react.**
-
-# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
-# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
--dontwarn android.text.StaticLayout
-
-# okhttp
-
--keepattributes Signature
--keepattributes *Annotation*
--keep class okhttp3.** { *; }
--keep interface okhttp3.** { *; }
--dontwarn okhttp3.**
-
-# okio
-
--keep class sun.misc.Unsafe { *; }
--dontwarn java.nio.file.*
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
--dontwarn okio.**

android/app/proguard-rules.pro

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.codepushdemoapp"
-    android:versionCode="1"
-    android:versionName="2.1.0">
+    package="com.codepushdemoapp">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,9 @@
 package com.codepushdemoapp;
 
 import android.app.Application;
-import android.util.Log;
 
 import com.facebook.react.ReactApplication;
 import com.microsoft.codepush.react.CodePush;
-import com.microsoft.codepush.react.CodePushBuilder;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -32,10 +30,11 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-          new CodePushBuilder(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey),getApplicationContext())
-                .setIsDebugMode(BuildConfig.DEBUG)
-                .setServerUrl(getResources().getString(R.string.reactNativeCodePush_androidServerURL))
-                .build()
+          new CodePush(
+            getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), 
+            getApplicationContext(), BuildConfig.DEBUG, 
+            getResources().getString(R.string.reactNativeCodePush_androidServerURL)
+          )
       );
     }