fix(cli): Don't downgrade deployment target on migrate (#7953)

Author: jcesarmobile

cli/src/ios/common.ts

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process';
-import { readFile, writeFile } from 'fs-extra';
-import { resolve } from 'path';
+import { readFile, readFileSync, writeFile } from 'fs-extra';
+import { join, resolve } from 'path';
 
 import c from '../colors';
 import { checkCapacitorPlatform } from '../common';
@@ -103,3 +103,13 @@ export async function editProjectSettingsIOS(config: Config): Promise<void> {
   await writeFile(plistPath, plistContent, { encoding: 'utf-8' });
   await writeFile(pbxPath, pbxContent, { encoding: 'utf-8' });
 }
+
+export function getMajoriOSVersion(config: Config): string {
+  const pbx = readFileSync(join(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
+  const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
+  const iosVersion = pbx.substring(
+    pbx.indexOf(searchString) + searchString.length,
+    pbx.indexOf(searchString) + searchString.length + 2,
+  );
+  return iosVersion;
+}

cli/src/tasks/migrate.ts

@@ -8,6 +8,7 @@ import c from '../colors';
 import { getCoreVersion, runTask, checkJDKMajorVersion } from '../common';
 import type { Config } from '../definitions';
 import { fatal } from '../errors';
+import { getMajoriOSVersion } from '../ios/common';
 import { logger, logPrompt, logSuccess } from '../log';
 import { getPlugins } from '../plugin';
 import { deleteFolderRecursive } from '../util/fs';
@@ -48,6 +49,7 @@ const plugins = [
 const coreVersion = '^7.0.0';
 const pluginVersion = '^7.0.0';
 const gradleVersion = '8.11.1';
+const iOSVersion = '14';
 let installFailed = false;
 
 export async function migrateCommand(config: Config, noprompt: boolean, packagemanager: string): Promise<void> {
@@ -90,7 +92,7 @@ export async function migrateCommand(config: Config, noprompt: boolean, packagem
 
   const { migrateconfirm } = noprompt
     ? { migrateconfirm: 'y' }
-    : await logPrompt(`Capacitor 7 sets a deployment target of iOS 14 and Android 15 (SDK 35). \n`, {
+    : await logPrompt(`Capacitor 7 sets a deployment target of iOS ${iOSVersion} and Android 15 (SDK 35). \n`, {
         type: 'text',
         name: 'migrateconfirm',
         message: `Are you sure you want to migrate? (Y/n)`,
@@ -147,23 +149,33 @@ export async function migrateCommand(config: Config, noprompt: boolean, packagem
 
       // Update iOS Projects
       if (allDependencies['@capacitor/ios'] && existsSync(config.ios.platformDirAbs)) {
-        // ios template changes
-        // Set deployment target to 14.0
-        await runTask(`Migrating deployment target to 14.0.`, () => {
-          return updateFile(
-            config,
-            join(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'),
-            'IPHONEOS_DEPLOYMENT_TARGET = ',
-            ';',
-            '14.0',
-          );
-        });
-
-        if ((await checkPackageManager(config)) === 'Cocoapods') {
-          // Update Podfile to 14.0
-          await runTask(`Migrating Podfile to 14.0.`, () => {
-            return updateFile(config, join(config.ios.nativeProjectDirAbs, 'Podfile'), `platform :ios, '`, `'`, '14.0');
+        const currentiOSVersion = getMajoriOSVersion(config);
+        if (parseInt(currentiOSVersion) < parseInt(iOSVersion)) {
+          // ios template changes
+          await runTask(`Migrating deployment target to ${iOSVersion}.0.`, () => {
+            return updateFile(
+              config,
+              join(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'),
+              'IPHONEOS_DEPLOYMENT_TARGET = ',
+              ';',
+              `${iOSVersion}.0`,
+            );
           });
+
+          if ((await checkPackageManager(config)) === 'Cocoapods') {
+            // Update Podfile
+            await runTask(`Migrating Podfile to ${iOSVersion}.0.`, () => {
+              return updateFile(
+                config,
+                join(config.ios.nativeProjectDirAbs, 'Podfile'),
+                `platform :ios, '`,
+                `'`,
+                `${iOSVersion}.0`,
+              );
+            });
+          }
+        } else {
+          logger.warn('Skipped updating deployment target');
         }
       }
 

cli/src/util/spm.ts

@@ -1,8 +1,9 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs-extra';
-import { join, relative, resolve } from 'path';
+import { existsSync, writeFileSync } from 'fs-extra';
+import { relative, resolve } from 'path';
 
 import { getCapacitorPackageVersion } from '../common';
 import type { Config } from '../definitions';
+import { getMajoriOSVersion } from '../ios/common';
 import { logger } from '../log';
 import type { Plugin } from '../plugin';
 
@@ -37,13 +38,7 @@ export async function generatePackageFile(config: Config, plugins: Plugin[]): Pr
 
 async function generatePackageText(config: Config, plugins: Plugin[]): Promise<string> {
   const iosPlatformVersion = await getCapacitorPackageVersion(config, config.ios.name);
-
-  const pbx = readFileSync(join(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
-  const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
-  const iosVersion = pbx.substring(
-    pbx.indexOf(searchString) + searchString.length,
-    pbx.indexOf(searchString) + searchString.length + 2,
-  );
+  const iosVersion = getMajoriOSVersion(config);
 
   let packageSwiftText = `// swift-tools-version: 5.9
 import PackageDescription