@capacitor/cli 4.4.0 → 4.4.1-nightly-20221024T151237.0

package/dist/tasks/migrate.js

@@ -338,8 +338,13 @@ async function updateBuildGradle(filename, leaveJCenter, variablesAndClasspaths)
     let replaced = txt;
     for (const dep of Object.keys(neededDeps)) {
         if (replaced.includes(`classpath '${dep}`)) {
-            replaced = setAllStringIn(replaced, `classpath '${dep}:`, `'`, neededDeps[dep]);
-            log_1.logger.info(`Set ${dep} = ${neededDeps[dep]}.`);
+            const semver = await Promise.resolve().then(() => tslib_1.__importStar(require('semver')));
+            const firstIndex = replaced.indexOf(dep) + dep.length + 1;
+            const existingVersion = '' + replaced.substring(firstIndex, replaced.indexOf("'", firstIndex));
+            if (semver.gte(neededDeps[dep], existingVersion)) {
+                replaced = setAllStringIn(replaced, `classpath '${dep}:`, `'`, neededDeps[dep]);
+                log_1.logger.info(`Set ${dep} = ${neededDeps[dep]}.`);
+            }
         }
     }
     // Replace jcenter()
@@ -669,11 +674,13 @@ async function migrateMainActivity(config) {
             data = data.replace('// Initializes the Bridge', '');
         }
         const rindex = data.indexOf('registerPlugin');
+        const superLine = 'super.onCreate(savedInstanceState);';
         if (rindex !== -1) {
-            if (data.indexOf('super.onCreate(savedInstanceState);') < rindex) {
-                data = data.replace('super.onCreate(savedInstanceState);\n        ', '');
+            if (data.indexOf(superLine) < rindex) {
+                const linePadding = rindex - data.indexOf(superLine) - superLine.length - 1;
+                data = data.replace(`${superLine}\n${' '.repeat(linePadding)}`, '');
                 const eindex = data.lastIndexOf('.class);') + 8;
-                data = data.replace(data.substring(bindex, eindex), `${data.substring(bindex, eindex)}\n        super.onCreate(savedInstanceState);`);
+                data = data.replace(data.substring(bindex, eindex), `${data.substring(bindex, eindex)}\n${' '.repeat(linePadding) + superLine.padStart(linePadding)}`);
             }
         }
         if (bindex == -1 && rindex == -1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "4.4.0",
+  "version": "4.4.1-nightly-20221024T151237.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9ec5a3059e109dbf2bd656f895243487eebeba5"
+  "gitHead": "ae941017fff3bcfa75e0788535f356a56ce6fa05"
 }