Merge branch 'v12'

Author: floydkim

CodePush.podspec

@@ -10,18 +10,18 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.homepage       = package['homepage']
   s.source         = { :git => 'https://github.com/Soomgo-Mobile/react-native-code-push.git', :tag => "v#{s.version}"}
-  s.ios.deployment_target = '9.0'
-  s.tvos.deployment_target = '9.0'
+  s.ios.deployment_target = '15.5'
+  s.tvos.deployment_target = '15.5'
   s.preserve_paths = '*.js'
   s.library        = 'z'
   s.source_files = 'ios/CodePush/*.{h,m}'
   s.public_header_files = ['ios/CodePush/CodePush.h']
 
-  # Note: Even though there are copy/pasted versions of some of these dependencies in the repo, 
-  # we explicitly let CocoaPods pull in the versions below so all dependencies are resolved and 
+  # Note: Even though there are copy/pasted versions of some of these dependencies in the repo,
+  # we explicitly let CocoaPods pull in the versions below so all dependencies are resolved and
   # linked properly at a parent workspace level.
   s.dependency 'React-Core'
-  s.dependency 'SSZipArchive', '~> 2.2.2'
+  s.dependency 'SSZipArchive', '~> 2.5.5'
   s.dependency 'JWT', '~> 3.0.0-beta.12'
   s.dependency 'Base64', '~> 1.1'
 end

Examples/CodePushDemoApp/ios/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - Base64 (1.1.2)
   - boost (1.84.0)
-  - CodePush (9.0.0.4):
+  - CodePush (11.0.0):
     - Base64 (~> 1.1)
     - JWT (~> 3.0.0-beta.12)
     - React-Core
@@ -1729,7 +1729,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  CodePush: 3e821758507fccf63f1ce571e1dcd97386213298
+  CodePush: dad1256b3cc3f91a945d2bb8ac2a5603df87e198
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
   FBLazyVector: 79c4b7ec726447eec5f8593379466bd9fde1aa14

Examples/CodePushDemoApp/package-lock.json

@@ -10,7 +10,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@bravemobile/react-native-code-push": "^9.0.0",
+    "@bravemobile/react-native-code-push": "^11.0.0",
     "axios": "^1.7.9",
     "react": "18.3.1",
     "react-native": "0.77.1"

Examples/CodePushDemoApp/package.json

@@ -1,6 +1,9 @@
 /*
 The script serves to generate CodePushified React Native app to reproduce issues or for testing purposes.
 
+NOTE: Use CodePushDemoApp and CodePushDemoAppCpp as reference how to implement CodePush in your app. For creating a working demo app
+follow steps bellow.
+
 Requirements:
     1. npm i -g react-native-cli
     2. npm i -g appcenter-cli
@@ -34,13 +37,6 @@ if (fs.existsSync(appName)) {
     process.exit();
 }
 
-// Checking if yarn is installed
-try {
-    execCommand('yarn bin');
-} catch (err) {
-    console.error(`You must install 'yarn' to use this script!`);
-    process.exit();
-}
 
 const appNameAndroid = `${appName}-android`;
 const appNameIOS = `${appName}-ios`;
@@ -49,6 +45,7 @@ const reactNativeVersion = args[1] || `react-native@${execCommand('npm view reac
 const reactNativeVersionIsLowerThanV049 = isReactNativeVersionLowerThan(49);
 const reactNativeCodePushVersion = args[2] || `react-native-code-push@${execCommand('npm view react-native-code-push version')}`.trim();
 
+const reactNativeVersionIsLowerThanV073 = isReactNativeVersionLowerThan(73)
 if (!isReactNativeVersionLowerThan(60) && process.platform === "darwin") {
     try {
         console.log("Verify that CocoaPods installed");
@@ -89,8 +86,8 @@ function createCodePushApp(name, os) {
             const app = JSON.parse(appResult);
             owner = app.owner.name;
             console.log(`App "${name}" has been created \n`);
-        } catch(e) {
-            console.error(`Error: Unable to create CodePush app. Please check that you haven't application with "${name}" name on portal.`, );
+        } catch (e) {
+            console.error(`Error: Unable to create CodePush app. Please check that you haven't application with "${name}" name on portal.`,);
             console.error("Error: ", e.toString());
         }
         execCommand(`appcenter codepush deployment add -a ${owner}/${name} Staging`);
@@ -128,7 +125,7 @@ function generatePlainReactNativeApp(appName, reactNativeVersion) {
 
 function installCodePush(reactNativeCodePushVersion) {
     console.log(`Installing React Native Module for CodePush...`);
-    execCommand(`yarn add ${reactNativeCodePushVersion}`);
+    execCommand(`npm i ${reactNativeCodePushVersion}`);
     console.log(`React Native Module for CodePush has been installed \n`);
 }
 
@@ -213,8 +210,8 @@ function optimizeToTestInDebugMode() {
     const rnXcodeShPath = `node_modules/react-native/${rnXcodeShLocationFolder}/react-native-xcode.sh`;
     // Replace "if [[ "$PLATFORM_NAME" == *simulator ]]; then" with "if false; then" to force bundling
     execCommand(`sed -ie 's/if \\[\\[ "\$PLATFORM_NAME" == \\*simulator \\]\\]; then/if false; then/' ${rnXcodeShPath}`);
-    execCommand(`perl -i -p0e 's/#ifdef DEBUG.*?#endif/jsCodeLocation = [CodePush bundleURL];/s' ios/${appName}/AppDelegate.m`);
-    execCommand(`sed -ie 's/targetName.toLowerCase().contains("release")/true/' node_modules/react-native/react.gradle`);
+    execCommand(`perl -i -p0e 's/#ifdef DEBUG.*?#endif/jsCodeLocation = [CodePush bundleURL];/s' ios/${appName}/${getAppDelegateName()}`);
+    reactNativeVersionIsLowerThanV073 && execCommand(`sed -ie 's/targetName.toLowerCase().contains("release")/true/' node_modules/react-native/react.gradle`);
 }
 
 function grantAccess(folderPath) {
@@ -250,7 +247,8 @@ function isReactNativeVersionLowerThan(version) {
 function androidSetup() {
     const buildGradlePath = path.join('android', 'app', 'build.gradle');
     const settingsGradlePath = path.join('android', 'settings.gradle');
-    const mainApplicationPath = path.join('android', 'app', 'src', 'main', 'java', 'com', appName, 'MainApplication.java');
+    const mainApplicationType = reactNativeVersionIsLowerThanV073 ? 'java' : 'kt';
+    const mainApplicationPath = path.join('android', 'app', 'src', 'main', 'java', 'com', appName, `MainApplication.${mainApplicationType}`);
     const stringsResourcesPath = path.join('android', 'app', 'src', 'main', 'res', 'values', 'strings.xml');
 
     let stringsResourcesContent = fs.readFileSync(stringsResourcesPath, "utf8");
@@ -260,47 +258,78 @@ function androidSetup() {
     fs.writeFileSync(stringsResourcesPath, stringsResourcesContent);
 
     let buildGradleContents = fs.readFileSync(buildGradlePath, "utf8");
-    const reactGradleLink = buildGradleContents.match(/\napply from: ["'].*?react\.gradle["']/)[0];
+    const reactGradleLink = buildGradleContents.match(/\napply from: ["'].*?react\.gradle["']/);
     const codePushGradleLink = `\napply from: "../../node_modules/react-native-code-push/android/codepush.gradle"`;
-    buildGradleContents = buildGradleContents.replace(reactGradleLink,
-        `${reactGradleLink}${codePushGradleLink}`);
-    fs.writeFileSync(buildGradlePath, buildGradleContents);
+    if (reactGradleLink != null) {
+        buildGradleContents = buildGradleContents.replace(reactGradleLink[0],
+            `${reactGradleLink[0]}${codePushGradleLink}`);
+        fs.writeFileSync(buildGradlePath, buildGradleContents);
+    }
+    // react.gradle script removed from 0.71 thus this workaround
+    else {
+        const appPluginLastLine = buildGradleContents.match(/apply plugin: "com.facebook.react"/)[0];
+        buildGradleContents = buildGradleContents.replace(appPluginLastLine, `${appPluginLastLine}${codePushGradleLink}`)
+        fs.writeFileSync(buildGradlePath, buildGradleContents);
+    }
 
     let settingsGradleContents = fs.readFileSync(settingsGradlePath, "utf8");
     const settingsGradleInclude = "include \':app\'";
-    const codePushProjectImport= `':react-native-code-push'\nproject(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')`;
+    const codePushProjectImport = `':react-native-code-push'\nproject(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')`;
     settingsGradleContents = settingsGradleContents.replace(settingsGradleInclude,
         `${settingsGradleInclude}, ${codePushProjectImport}`);
     fs.writeFileSync(settingsGradlePath, settingsGradleContents);
 
-    const getJSBundleFileOverride = `
-    @Override
-    protected String getJSBundleFile(){
-        return CodePush.getJSBundleFile();
-    }
-    `;
+    let importCodePush = `\nimport com.microsoft.codepush.react.CodePush;`;
+    let reactNativeHostInstantiationImport = "import android.app.Application;";
     let mainApplicationContents = fs.readFileSync(mainApplicationPath, "utf8");
-    const reactNativeHostInstantiation = "new ReactNativeHost(this) {";
+    let getJSBundleFileOverride = "";
+    let reactNativeHostInstantiation = "";
+
+    // handle react-native version with java
+    if (reactNativeVersionIsLowerThanV073) {
+        reactNativeHostInstantiation = "new ReactNativeHost(this) {";
+
+        getJSBundleFileOverride = `
+        @Override
+        protected String getJSBundleFile(){
+            return CodePush.getJSBundleFile();
+        }
+        `;
+    }
+    // handle react-native version with kotlin
+    else {
+        reactNativeHostInstantiation = "object : DefaultReactNativeHost(this) {"
+        getJSBundleFileOverride = `
+         override fun getJSBundleFile(): String {
+            return CodePush.getJSBundleFile() 
+        }
+        `;
+        importCodePush = importCodePush.replace(';', '');
+        reactNativeHostInstantiationImport = reactNativeHostInstantiationImport.replace(';', '');
+    }
     mainApplicationContents = mainApplicationContents.replace(reactNativeHostInstantiation,
         `${reactNativeHostInstantiation}${getJSBundleFileOverride}`);
 
-    const importCodePush = `\nimport com.microsoft.codepush.react.CodePush;`;
-    const reactNativeHostInstantiationImport = "import android.app.Application;";
     mainApplicationContents = mainApplicationContents.replace(reactNativeHostInstantiationImport,
         `${reactNativeHostInstantiationImport}${importCodePush}`);
     fs.writeFileSync(mainApplicationPath, mainApplicationContents);
 }
 
+function getAppDelegateName() { return fs.readdirSync(path.join('ios', appName)).find(file => file === ('AppDelegate.mm') || file === 'AppDelegate.m') };
+
 // Configuring ios applications for react-native version higher than 0.60
 function iosSetup() {
     const plistPath = path.join('ios', appName, 'Info.plist');
-    const appDelegatePath = path.join('ios', appName, 'AppDelegate.m');
+
+    const appDelegatePath = path.join('ios', appName, getAppDelegateName());
 
     let plistContents = fs.readFileSync(plistPath, "utf8");
-    const falseInfoPlist = `<false/>`;
+
+    const dictPlistTag = `</dict>\n</plist>`;
+
     const codePushDeploymentKey = iosStagingDeploymentKey || 'deployment-key-here';
-    plistContents = plistContents.replace(falseInfoPlist,
-        `${falseInfoPlist}\n\t<key>CodePushDeploymentKey</key>\n\t<string>${codePushDeploymentKey}</string>`);
+    plistContents = plistContents.replace(dictPlistTag,
+        `\t<key>CodePushDeploymentKey</key>\n\t<string>${codePushDeploymentKey}</string>${dictPlistTag}`);
     fs.writeFileSync(plistPath, plistContents);
 
     let appDelegateContents = fs.readFileSync(appDelegatePath, "utf8");