android can work

flyskywhy · flyskywhy · commit 36b3e737d6a1 · 2017-11-29T21:47:57.000+08:00
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -66,6 +66,7 @@ import com.android.build.OutputFile
  */
 
 apply from: "../../node_modules/react-native/react.gradle"
+apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
diff --git a/android/app/proguard-rules.pro b/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,17 +54,13 @@
 
 -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
 
 -keep class sun.misc.Unsafe { *; }
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
-
-# stetho
-
--dontwarn com.facebook.stetho.**
diff --git a/android/app/react.gradle b/android/app/react.gradle
diff --git a/android/app/src/main/java/com/noder/MainApplication.java b/android/app/src/main/java/com/noder/MainApplication.java
@@ -35,7 +35,7 @@ protected String getJSBundleFile() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-            new CodePush("Q2A8khx6JV4mXXcS0usR0LipDz0Y410YoZxlZ", this, BuildConfig.DEBUG),
+            new CodePush("Q2A8khx6JV4mXXcS0usR0LipDz0Y410YoZxlZ", MainApplication.this, BuildConfig.DEBUG),
             new VectorIconsPackage(),
             new RCTCameraPackage(),
             new BarcodeScannerPackage()
diff --git a/android/build.gradle b/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"
         }
     }
 }
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "react-native-button": "^1.6.0",
     "react-native-camera": "git+https://github.com/lwansbrough/react-native-camera.git",
     "react-native-cli": "^1.0.0",
-    "react-native-code-push": "^1.12.2-beta",
+    "react-native-code-push": "^2.1.1-beta",
     "react-native-html-render": "^1.0.5",
     "react-native-scrollable-tab-view": "^0.5.1",
     "react-native-vector-icons": "^2.0.3",

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ allprojects {`
`18`	`18`	`jcenter()`
`19`	`19`	`maven {`
`20`	`20`	`// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm`
`21`		`- url "$projectDir/../../node_modules/react-native/android"`
	`21`	`+ url "$rootDir/../node_modules/react-native/android"`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`