@revopush/react-native-code-push 1.2.0 → 1.4.0

package/README.md

@@ -50,7 +50,9 @@ We try our best to maintain backwards compatibility of our plugin with previous
 | React Native version(s) | Supporting CodePush version(s)                                                              |
 |-------------------------|---------------------------------------------------------------------------------------------|
 | <v0.76                  | Use [microsoft/code-push-react-native](https://github.com/microsoft/react-native-code-push) |
-| v0.76, v0.77, 0.78      | v1.0+ *(Support both New and Old Architectures)*                                            |
+| 0.76, 0.77, 0.78, 0.79  | v1.0+ *(Support both New and Old Architectures)*                                            |
+| v0.80                   | v1.2                                                                                        |
+| Expo sdk 52             | v1.3                                                                                        | 
 
 
 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.

package/android/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         google()
@@ -13,12 +11,51 @@ buildscript {
     }
 }
 
-allprojects {
-    android {
-        namespace "com.microsoft.codepush.react"
+apply plugin: "com.android.library"
+
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
+
+if (IS_NEW_ARCHITECTURE_ENABLED) {
+    apply plugin: "com.facebook.react"
+}
+
+def DEFAULT_COMPILE_SDK_VERSION = 26
+def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 26
+def DEFAULT_MIN_SDK_VERSION = 16
+
+android {
+    namespace "com.microsoft.codepush.react"
+
+    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
+    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+
+    defaultConfig {
+        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
+        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
+        versionCode 1
+        versionName "1.0"
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
     }
-    repositories {
-        mavenLocal()
-        mavenCentral()
+
+    lintOptions {
+        abortOnError false
     }
+
+    defaultConfig {
+        consumerProguardFiles 'proguard-rules.pro'
+    }
+}
+
+dependencies {
+    implementation "com.facebook.react:react-native:+"
+    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
 }

package/android/{app/src → src}/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -152,7 +152,11 @@ public class CodePushNativeModule extends BaseJavaModule {
             Field bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
             bundleLoaderField.setAccessible(true);
             bundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
-        } catch (Exception e) {
+        }
+        catch (NoSuchFieldException noSuchFileFound) {
+            // Ignore this error for Expo
+        }
+        catch (Exception e) {
             CodePushUtils.log("Unable to set JSBundle of ReactHostDelegate - CodePush may not support this version of React Native");
             throw new IllegalAccessException("Could not setJSBundle");
         }
@@ -182,13 +186,23 @@ public class CodePushNativeModule extends BaseJavaModule {
                 //     logic to reload the current React context.
                 final ReactHost reactHost = resolveReactHost();
                 if (reactHost == null) {
+                    loadBundleLegacy();
                     return;
                 }
 
                 String latestJSBundleFile = mCodePush.getJSBundleFileInternal(mCodePush.getAssetsBundleFileName());
 
-                // #2) Update the locally stored JS bundle file path
-                setJSBundle(getReactHostDelegate((ReactHostImpl) reactHost), latestJSBundleFile);
+                try {
+                    if (reactHost instanceof ReactHostImpl) {
+                        ReactHostDelegate delegate = getReactHostDelegate((ReactHostImpl) reactHost);
+                        if (delegate != null) {
+                            // #2) Update the locally stored JS bundle file path
+                            setJSBundle(delegate, latestJSBundleFile);
+                        }
+                    }
+                } catch (Exception e) {
+                    CodePushUtils.log("Exception setJSBundle: " + e.getMessage());
+                }
 
                 // #3) Get the context creation method
                 try {

package/package.json

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

package/react-native.config.js

@@ -4,7 +4,7 @@ module.exports = {
             android: {
                 packageInstance:
                     "CodePush.getInstance(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)",
-                sourceDir: './android/app',
+                sourceDir: './android',
             }
         }
     }

package/scripts/tools/linkToolsAndroid.js

@@ -29,7 +29,7 @@ exports.getStringsResourcesPath = function () {
 }
 
 exports.getBuildGradlePath = function () {
-    return path.join("android", "app", "build.gradle");
+    return path.join("android", "build.gradle");
 }
 
 exports.isJsBundleOverridden = function (codeContents) {

package/.azurepipelines/build-rn-code-push-1es.yml

@@ -1,104 +0,0 @@
-trigger:
-- master
-
-pr:
-- master
-
-resources:
-  repositories:
-  - repository: 1ESPipelineTemplates
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-name: $(Build.SourceBranchName)_$(date:yyyyMMdd)$(rev:.r)
-
-extends:
-  ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
-    template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
-  ${{ else }}:
-    template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
-  parameters:
-    pool:
-      name: 1ES-PT-CBL-Mariner-2.0-Gen2
-      os: linux
-    customBuildTags:
-    - ES365AIMigrationTooling-BulkMigrated
-    sdl:
-      sourceAnalysisPool: 1ES-PT-Windows-2022
-      credscan:
-        suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json
-    stages:
-    - stage: Stage
-      jobs:
-      - job: HostJob
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            displayName: "Publish Artifact: artifacts"
-            path: '$(Build.ArtifactStagingDirectory)/npm'
-            artifactName: npm
-            
-        steps:
-        - task: NodeTool@0
-          inputs:
-            versionSpec: '14.x'
-          displayName: 'Install Node.js'
-
-        - script: |
-            npm pack
-            npm install -g react-native-code-push*.tgz
-          displayName: 'Package react-native-code-push'
-          workingDirectory: $(Build.SourcesDirectory)
-
-        - task: DeleteFiles@1
-          inputs:
-            contents: node_modules
-          displayName: 'Delete node_modules'
-
-        - task: ArchiveFiles@2
-          inputs:
-            rootFolderOrFile: '$(Build.SourcesDirectory)'
-            includeRootFolder: false
-            archiveType: 'tar'
-            archiveFile: '$(Build.ArtifactStagingDirectory)/npm/$(Build.BuildId).tgz'
-            replaceExistingArchive: true
-            verbose: true
-          displayName: 'Prepare npm artifact'
-
-    - stage: APIScan
-      dependsOn: Stage
-      pool:
-        name: 1ES-PT-Windows-2022
-        os: windows
-      variables:
-        "agent.source.skip": true
-      jobs:
-      - job: APIScan
-        steps:
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Build Artifacts for APIScan
-          inputs:
-            artifactName: npm
-            targetPath: '$(Agent.BuildDirectory)/npm'
-        - task: ExtractFiles@1
-          inputs:
-            archiveFilePatterns: '$(Agent.BuildDirectory)/npm/*.tgz'
-            destinationFolder: '$(Agent.BuildDirectory)/npm_extracted'
-        - task: AzureKeyVault@2
-          inputs:
-            azureSubscription: 'AC - Dev Infra & Build Pool'
-            KeyVaultName: 'mobile-center-sdk'
-            SecretsFilter: 'appcenter-sdk-managed-identity-clientid'
-            RunAsPreJob: false
-        - task: APIScan@2
-          displayName: 'Run APIScan'
-          inputs:
-            softwareFolder: '$(Agent.BuildDirectory)\npm_extracted'
-            softwareName: 'react-native-code-push'
-            softwareVersionNum: '$(Build.BuildId)'
-            isLargeApp: false
-            toolVersion: 'Latest'
-            verbosityLevel: verbose
-          condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
-          env:
-            AzureServicesAuthConnectionString: 'runAs=App;AppId=$(appcenter-sdk-managed-identity-clientid)'

package/.azurepipelines/test-rn-code-push.yml

@@ -1,94 +0,0 @@
-trigger:
-- master
-
-pr:
-- master
-
-variables:
-- name: api-level
-  value: '27' 
-
-pool:
-  vmImage: 'macOS-12'
-
-stages:
-- stage: RunTests
-  displayName: 'Run Android & IOS tests'
-  jobs:
-  - job: TestAndroid
-    timeoutInMinutes: 120
-    displayName: 'Test android'
-    steps:
-
-    - script: |
-        adb devices
-      displayName: 'Start adb server'
-
-    - script: |
-        $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-$(api-level);google_apis;x86"
-      displayName: 'Download system image'
-
-    - script: |
-        $ANDROID_HOME/tools/bin/avdmanager create avd --force --name TestEmulator --abi google_apis/x86 --package 'system-images;android-$(api-level);google_apis;x86' --device "Nexus 6P"
-      displayName: 'Creating Android emulator'
-
-    - script: |
-        $ANDROID_HOME/emulator/emulator -avd TestEmulator -noaudio -no-window -no-snapshot-save -no-boot-anim -memory 6144 &
-      displayName: 'Start Android emulator'
-
-    - script: |
-        $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done'
-      displayName: 'Wait for emulator to boot'
-   
-    - script: |
-         adb shell settings put global window_animation_scale 0.0    
-      displayName: 'Disable animations and transitions'  
-
-    - script: |
-         adb shell settings put global transition_animation_scale 0.0
-      displayName: 'Disable animations and transitions'
-
-    - script: |
-         adb shell settings put global animator_duration_scale 0.0   
-      displayName: 'Disable animations and transitions'
-
-    
-    - task: JavaToolInstaller@0
-      inputs:
-        versionSpec: '11'
-        jdkArchitectureOption: 'x64'
-        jdkSourceOption: 'PreInstalled'
-      displayName: 'Change Java version'
-
-    - script: |
-        npm install
-      displayName: 'Package Installation'
-
-    - script: |
-        npm run build:tests && npm run test:setup:android
-      displayName: 'Setup Android tests'
-
-    - script: |
-        npm run test:fast:android
-      displayName: 'Run Android test'
-
-  - job: TestIOS
-    timeoutInMinutes: 120
-    displayName: 'Test IOS'
-    steps:
-
-    - script: |
-        npm install
-      displayName: 'Install dependencies'
-
-    - script: |
-        npm run build:tests && npm run test:setup:ios
-      displayName: 'Setup iOS tests'
-
-    - script: |
-        npm run test:fast:ios
-      displayName: 'Run tests'
-
-    
-          
-

package/.config/CredScanSuppressions.json

@@ -1,14 +0,0 @@
-{
-  "tool": "Credential Scanner",
-    "suppressions": [        
-      {
-        "file": "/Examples/CodePushDemoApp/android/app/debug.keystore",
-        "_justification": "Used only in DemoApp"
-      },
-      {
-        "file": "/Examples/CodePushDemoAppCpp/windows/CodePushDemoAppCpp/CodePushDemoAppCpp_TemporaryKey.pfx",
-        "_justification": "Used only in DemoApp"
-      }
-    ]
-}
-  

package/android/app/build.gradle

@@ -1,48 +0,0 @@
-apply plugin: "com.android.library"
-
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
-
-def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
-
-if (IS_NEW_ARCHITECTURE_ENABLED) {
-    apply plugin: "com.facebook.react"
-}
-
-def DEFAULT_COMPILE_SDK_VERSION = 26
-def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
-def DEFAULT_TARGET_SDK_VERSION = 26
-def DEFAULT_MIN_SDK_VERSION = 16
-
-android {
-    namespace "com.microsoft.codepush.react"
-
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
-
-    defaultConfig {
-        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
-        versionCode 1
-        versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
-    }
-}
-
-dependencies {
-    implementation "com.facebook.react:react-native:+"
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
-}

package/android/settings.gradle

@@ -1 +0,0 @@
-include ':app'