Remove custom dialog

CodePush.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var { Alert } = require("./AlertAdapter");
+var { Alert } = require("react-native");
 var NativeCodePush = require("react-native").NativeModules.CodePush;
 var PackageMixins = require("./package-mixins")(NativeCodePush);
 var requestFetchAdapter = require("./request-fetch-adapter.js");

CodePushPackage.m

@@ -434,7 +434,7 @@ + (void)copyEntriesInFolder:(NSString *)sourceFolder
                 }
             }
 
-            [[NSFileManager defaultManager] moveItemAtPath:fullFilePath toPath:destFileName error:error];
+            [[NSFileManager defaultManager] copyItemAtPath:fullFilePath toPath:destFileName error:error];
             if (*error) {
                 return;
             }

Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/remotePackage.js

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   description: "Angry flappy birds",
   appVersion: "1.5.0",
   label: "2.4.0",

Examples/CodePushDemoApp/android/app/build.gradle

@@ -27,6 +27,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.0.0'
-    compile 'com.facebook.react:react-native:0.15.1'
+    compile 'com.facebook.react:react-native:0.17.0'
     compile project(':react-native-code-push')
 }

Examples/CodePushDemoApp/android/app/proguard-rules.pro

@@ -15,3 +15,46 @@
 #-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
+
+# Do not strip any method/class that is annotated with @DoNotStrip
+-keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.proguard.annotations.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 class *  { @com.facebook.react.uimanager.UIProp <fields>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.ReactProp <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.ReactPropGroup <methods>; }
+
+# okhttp
+
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
+-dontwarn com.squareup.okhttp.**
+
+# okio
+
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**

Examples/CodePushDemoApp/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Examples/CodePushDemoApp/package.json

@@ -6,7 +6,7 @@
     "start": "node_modules/react-native/packager/packager.sh --root ../../"
   },
   "dependencies": {
-    "react-native": "0.15.0",
+    "react-native": "0.17.0",
     "react-native-button": "^1.2.0",
     "react-native-code-push": "file:../../"
   },

android/app/build.gradle

@@ -24,5 +24,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.0.0'
-    compile 'com.facebook.react:react-native:0.15.1'
+    compile 'com.facebook.react:react-native:0.17.0'
 }

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -501,11 +501,7 @@ private class CodePushReactPackage implements ReactPackage {
         public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
             List<NativeModule> nativeModules = new ArrayList<>();
             CodePush.this.codePushNativeModule = new CodePushNativeModule(reactApplicationContext);
-            CodePushDialog dialogModule = new CodePushDialog(reactApplicationContext, mainActivity);
-
             nativeModules.add(CodePush.this.codePushNativeModule);
-            nativeModules.add(dialogModule);
-
             return nativeModules;
         }
 

package.json

@@ -20,6 +20,6 @@
     "semver": "^5.1.0"
   },
   "devDependencies": {
-    "react-native": "0.15.0"
+    "react-native": "0.17.0"
   }
 }