@revopush/react-native-code-push 2.5.0-rc.4 → 2.5.0-rc.6

package/android/build.gradle

@@ -56,7 +56,7 @@ dependencies {
         // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
         //noinspection GradleDynamicVersion
 
-        implementation "org.revopush:revopush-diff:0.0.5"
+        implementation "org.revopush:revopush-diff:0.0.7"
         implementation "com.facebook.react:react-native:+"
     }
 }

package/android/codepush.gradle

@@ -52,12 +52,6 @@ static def findNodeModulePath(baseDir, packageName) {
     return null
 }
 
-android.buildTypes.each { buildType ->
-    // to prevent incorrect long value restoration from strings.xml we need to wrap it with double quotes
-    // https://github.com/microsoft/cordova-plugin-code-push/issues/264
-    buildType.resValue 'string', "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis())
-}
-
 gradle.projectsEvaluated {
     def debuggableVariants = config.debuggableVariants ? config.debuggableVariants.get() : ['debug']
 
@@ -82,7 +76,7 @@ gradle.projectsEvaluated {
         def jsBundleFile;
 
         // Additional node commandline arguments
-        def nodeExecutableAndArgs = config.nodeExecutableAndArgs ? config.nodeExecutableAndArgs.get(): ["node"]
+        def nodeExecutableAndArgs = config.nodeExecutableAndArgs ? config.nodeExecutableAndArgs.get() : ["node"]
         def extraPackagerArgs = config.extraPackagerArgs ? config.extraPackagerArgs.get() : []
 
         // Make this task run right after the bundle task
@@ -104,7 +98,7 @@ gradle.projectsEvaluated {
             generateBundledResourcesHash = tasks.create(
                     name: "generateBundledResourcesHash${targetName}",
                     type: Exec) {
-                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir)
+                commandLine(*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir)
 
                 enabled !debuggableVariants.contains(variant.name) ?: targetName.toLowerCase().contains("release")
             }
@@ -113,11 +107,11 @@ gradle.projectsEvaluated {
             runBefore("merge${targetName}Assets", generateBundledResourcesHash)
         } else {
             def jsBundleDirConfigName = "jsBundleDir${targetName}"
-            jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ? elvisFile(config."$jsBundleDirConfigName").get():
+            jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ? elvisFile(config."$jsBundleDirConfigName").get() :
                     file("$buildDir/intermediates/assets/${targetPath}")
 
             def resourcesDirConfigName = "resourcesDir${targetName}"
-            resourcesDir = elvisFile(config."${resourcesDirConfigName}") ? elvisFile(config."${resourcesDirConfigName}").get():
+            resourcesDir = elvisFile(config."${resourcesDirConfigName}") ? elvisFile(config."${resourcesDirConfigName}").get() :
                     file("$buildDir/intermediates/res/merged/${targetPath}")
 
             // In case version of 'Android Plugin for Gradle'' is lower than 1.3.0
@@ -129,19 +123,19 @@ gradle.projectsEvaluated {
 
             jsBundleFile = file("$jsBundleDir/$bundleAssetName")
 
-            def resourcesMapTempFileName = "CodePushResourcesMap-" + java.util.UUID.randomUUID().toString().substring(0,8) + ".json"
+            def resourcesMapTempFileName = "CodePushResourcesMap-" + java.util.UUID.randomUUID().toString().substring(0, 8) + ".json"
 
             generateBundledResourcesHash = tasks.create(
                     name: "generateBundledResourcesHash${targetName}",
                     type: Exec) {
-                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir, resourcesMapTempFileName)
+                commandLine(*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir, resourcesMapTempFileName)
             }
 
             // Make this task run right before the bundle task
             def recordFilesBeforeBundleCommand = tasks.create(
                     name: "recordFilesBeforeBundleCommand${targetName}",
                     type: Exec) {
-                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/recordFilesBeforeBundleCommand.js", resourcesDir, resourcesMapTempFileName)
+                commandLine(*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/recordFilesBeforeBundleCommand.js", resourcesDir, resourcesMapTempFileName)
             }
 
             recordFilesBeforeBundleCommand.dependsOn("merge${targetName}Resources")
@@ -160,3 +154,21 @@ gradle.projectsEvaluated {
         runBefore("process${targetName}Resources", generateBundledResourcesHash)
     }
 }
+
+project.extensions.findByName("androidComponents")?.finalizeDsl { extension ->
+    // This disables density-based APK splitting for the App Bundle
+    extension.bundle.density.enableSplit = false
+
+    extension.androidResources.noCompress += "png"
+
+    extension.buildTypes.all { buildType ->
+        // disable PNG crunching for release builds to align APK resources with what Metro builds
+        if(!buildType.debuggable){
+            crunchPngs = false
+        }
+
+        // to prevent incorrect long value restoration from strings.xml we need to wrap it with double quotes
+        // https://github.com/microsoft/cordova-plugin-code-push/issues/264
+        buildType.resValue('string', "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis()))
+    }
+}

package/android/src/main/java/com/microsoft/codepush/react/FileUtils.java

@@ -36,9 +36,7 @@ public class FileUtils {
             }
         }
 
-        if (!file.delete()) {
-            CodePushUtils.log("Error deleting file " + file.getName());
-        }
+        file.delete()
     }
 
     public static boolean fileAtPathExists(String filePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/react-native-code-push",
-  "version": "2.5.0-rc.4",
+  "version": "2.5.0-rc.6",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",

package/scripts/generateBundledResourcesHash.js

@@ -52,7 +52,7 @@ function getBundleResourceEntries(resourcesDir, assetsDir) {
 
   const normalizePath = (it) => path.join(CODE_PUSH_FOLDER_PREFIX, it).replace(/\\/g, "/")
   return {
-    resources: Object.fromEntries(resourceFilesRelative.map((it) => [path.parse(it).name, normalizePath(it)])),
+    resources: Object.fromEntries(resourceFilesRelative.map((it) => [normalizePath(it), path.parse(it).name])),
     assets: Object.fromEntries(assetsFilesRelative.map((it) => [it.replace(/\\/g, "/"), normalizePath(it)]))
   }
 }

package/typings/react-native-code-push.d.ts

@@ -122,8 +122,8 @@ export interface SyncOptions {
 
     /**
      * Specifies the minimum number of seconds that the app needs to have been in the background before restarting the app. This property
-     * only applies to updates which are installed using `InstallMode.ON_NEXT_RESUME` or `InstallMode.ON_NEXT_SUSPEND`, and can be useful 
-     * for getting your update in front of end users sooner, without being too obtrusive. Defaults to `0`, which has the effect of applying 
+     * only applies to updates which are installed using `InstallMode.ON_NEXT_RESUME` or `InstallMode.ON_NEXT_SUSPEND`, and can be useful
+     * for getting your update in front of end users sooner, without being too obtrusive. Defaults to `0`, which has the effect of applying
      * the update immediately after a resume or unless the app suspension is long enough to not matter, regardless how long it was in the background.
      */
     minimumBackgroundDuration?: number;
@@ -144,6 +144,12 @@ export interface SyncOptions {
      * one or more of the default values.
      */
     rollbackRetryOptions?: RollbackRetryOptions;
+
+    /**
+     * Indicates whether you would like to ignore failed updates. This is useful in scenarios where you want to install an update irrespective
+     * of whether the previous update was successful or not.
+     */
+    ignoreFailedUpdates?: Boolean;
 }
 
 export interface UpdateDialog {
@@ -257,7 +263,7 @@ declare namespace CodePush {
      * Asks the CodePush service whether the configured app deployment has an update available.
      *
      * @param deploymentKey The deployment key to use to query the CodePush server for an update.
-     * 
+     *
      * @param handleBinaryVersionMismatchCallback An optional callback for handling target binary version mismatch
      */
     function checkForUpdate(deploymentKey?: string, handleBinaryVersionMismatchCallback?: HandleBinaryVersionMismatchCallback): Promise<RemotePackage | null>;
@@ -267,12 +273,12 @@ declare namespace CodePush {
      *
      * @param updateState The state of the update you want to retrieve the metadata for. Defaults to UpdateState.RUNNING.
      */
-    function getUpdateMetadata(updateState?: UpdateState) : Promise<LocalPackage|null>;
+    function getUpdateMetadata(updateState?: UpdateState): Promise<LocalPackage | null>;
 
     /**
      * Notifies the CodePush runtime that an installed update is considered successful.
      */
-    function notifyAppReady(): Promise<StatusReport|void>;
+    function notifyAppReady(): Promise<StatusReport | void>;
 
     /**
      * Allow CodePush to restart the app.
@@ -326,7 +332,7 @@ declare namespace CodePush {
         /**
          * Indicates that you want to install the update, but don't want to restart the app until the next time
          * the end user resumes it from the background. This way, you don't disrupt their current session,
-         * but you can get the update in front of them sooner then having to wait for the next natural restart. 
+         * but you can get the update in front of them sooner then having to wait for the next natural restart.
          * This value is appropriate for silent installs that can be applied on resume in a non-invasive way.
          */
         ON_NEXT_RESUME,
@@ -347,30 +353,30 @@ declare namespace CodePush {
          * The app is up-to-date with the CodePush server.
          */
         UP_TO_DATE,
-            
+
         /**
          * An available update has been installed and will be run either immediately after the
          * syncStatusChangedCallback function returns or the next time the app resumes/restarts,
          * depending on the InstallMode specified in SyncOptions
          */
         UPDATE_INSTALLED,
-            
+
         /**
          * The app had an optional update which the end user chose to ignore.
          * (This is only applicable when the updateDialog is used)
          */
         UPDATE_IGNORED,
-            
+
         /**
          * The sync operation encountered an unknown error.
          */
         UNKNOWN_ERROR,
-        
+
         /**
          * There is an ongoing sync operation running which prevents the current call from being executed.
          */
         SYNC_IN_PROGRESS,
-            
+
         /**
          * The CodePush server is being queried for an update.
          */