@capacitor/cli 5.5.2-nightly-20231108T150443.0 → 6.0.0-alpha.2

package/dist/tasks/migrate.js

@@ -50,21 +50,21 @@ const plugins = [
     '@capacitor/text-zoom',
     '@capacitor/toast',
 ];
-const coreVersion = '^5.0.0';
-const pluginVersion = '^5.0.0';
-const gradleVersion = '8.0.2';
+const coreVersion = 'next';
+const pluginVersion = 'next';
+const gradleVersion = '8.2.1';
 let installFailed = false;
 async function migrateCommand(config, noprompt, packagemanager) {
     if (config === null) {
         (0, errors_1.fatal)('Config data missing');
     }
     const capMajor = await checkCapacitorMajorVersion(config);
-    if (capMajor < 4) {
-        (0, errors_1.fatal)('Migrate can only be used on capacitor 4 and above, please use the CLI in Capacitor 4 to upgrade to 4 first');
+    if (capMajor < 5) {
+        (0, errors_1.fatal)('Migrate can only be used on capacitor 5 and above, please use the CLI in Capacitor 5 to upgrade to 5 first');
     }
     const jdkMajor = await (0, common_2.checkJDKMajorVersion)();
     if (jdkMajor < 17) {
-        log_1.logger.warn('Capacitor 5 requires JDK 17 or higher. Some steps may fail.');
+        log_1.logger.warn('Capacitor 6 requires JDK 17 or higher. Some steps may fail.');
     }
     const variablesAndClasspaths = await getAndroidVariablesAndClasspaths(config);
     if (!variablesAndClasspaths) {
@@ -78,7 +78,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
     log_1.logger.info(monorepoWarning);
     const { migrateconfirm } = noprompt
         ? { migrateconfirm: 'y' }
-        : await (0, log_1.logPrompt)(`Capacitor 5 sets a deployment target of iOS 13 and Android 13 (SDK 33). \n`, {
+        : await (0, log_1.logPrompt)(`Capacitor 6 sets a deployment target of iOS 13 and Android 14 (SDK 34). \n`, {
             type: 'text',
             name: 'migrateconfirm',
             message: `Are you sure you want to migrate? (Y/n)`,
@@ -126,27 +126,28 @@ async function migrateCommand(config, noprompt, packagemanager) {
             // Update iOS Projects
             if (allDependencies['@capacitor/ios'] &&
                 (0, utils_fs_1.existsSync)(config.ios.platformDirAbs)) {
-                //Update icon to single 1024 x 1024 icon
-                await (0, common_2.runTask)('Update App Icon to only 1024 x 1024', () => {
-                    return updateAppIcons(config);
-                });
-                //Remove Podfile.lock from .gitignore
-                await (0, common_2.runTask)('Remove Podfile.lock from iOS .gitignore', () => {
-                    return updateIosGitIgnore((0, path_1.join)(config.ios.platformDirAbs, '.gitignore'));
-                });
+                // ios template changes
             }
             if (allDependencies['@capacitor/android'] &&
                 (0, utils_fs_1.existsSync)(config.android.platformDirAbs)) {
                 await (0, common_2.runTask)(`Migrating build.gradle file.`, () => {
                     return updateBuildGradle((0, path_1.join)(config.android.platformDirAbs, 'build.gradle'), variablesAndClasspaths);
                 });
-                // Remove enableJetifier
-                await (0, common_2.runTask)('Remove android.enableJetifier=true from gradle.properties', () => {
-                    return updateGradleProperties((0, path_1.join)(config.android.platformDirAbs, 'gradle.properties'));
-                });
-                // Move package from android manifest
-                await (0, common_2.runTask)('Migrating package from Manifest to build.gradle', () => {
-                    return movePackageFromManifestToBuildGradle((0, path_1.join)(config.android.platformDirAbs, 'app', 'src', 'main', 'AndroidManifest.xml'), (0, path_1.join)(config.android.platformDirAbs, 'app', 'build.gradle'));
+                // Replace deprecated compileSdkVersion
+                await (0, common_2.runTask)('Replacing deprecated compileSdkVersion from build.gradle', () => {
+                    return (async () => {
+                        const buildGradleFilename = (0, path_1.join)(config.android.platformDirAbs, 'app', 'build.gradle');
+                        const buildGradleText = readFile(buildGradleFilename);
+                        if (!buildGradleText) {
+                            log_1.logger.error(`Could not read ${buildGradleFilename}. Check its permissions and if it exists.`);
+                            return;
+                        }
+                        const compileSdk = `compileSdkVersion rootProject.ext.compileSdkVersion`;
+                        if (buildGradleText.includes(compileSdk)) {
+                            const buildGradleReplaced = buildGradleText.replace(compileSdk, `compileSdk rootProject.ext.compileSdkVersion`);
+                            (0, utils_fs_1.writeFileSync)(buildGradleFilename, buildGradleReplaced, 'utf-8');
+                        }
+                    })();
                 });
                 // Update gradle-wrapper.properties
                 await (0, common_2.runTask)(`Migrating gradle-wrapper.properties by updating gradle version to ${gradleVersion}.`, () => {
@@ -175,17 +176,18 @@ async function migrateCommand(config, noprompt, packagemanager) {
                             }
                         }
                         const pluginVariables = {
-                            firebaseMessagingVersion: '23.1.2',
+                            firebaseMessagingVersion: '23.2.1',
                             playServicesLocationVersion: '21.0.1',
                             androidxBrowserVersion: '1.5.0',
-                            androidxMaterialVersion: '1.8.0',
+                            androidxMaterialVersion: '1.10.0',
                             androidxExifInterfaceVersion: '1.3.6',
-                            androidxCoreKTXVersion: '1.10.0',
+                            androidxCoreKTXVersion: '1.12.0',
                             googleMapsPlayServicesVersion: '18.1.0',
-                            googleMapsUtilsVersion: '3.4.0',
+                            googleMapsUtilsVersion: '3.5.3',
                             googleMapsKtxVersion: '3.4.0',
                             googleMapsUtilsKtxVersion: '3.4.0',
-                            kotlinxCoroutinesVersion: '1.6.4',
+                            kotlinxCoroutinesVersion: '1.7.3',
+                            coreSplashScreenVersion: '1.0.1',
                         };
                         for (const variable of Object.keys(pluginVariables)) {
                             await updateFile(config, variablesPath, `${variable} = '`, `'`, pluginVariables[variable], true);
@@ -383,77 +385,6 @@ async function updateGradleWrapperFiles(platformDir) {
         cwd: platformDir,
     });
 }
-async function updateIosGitIgnore(filename) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    const lines = txt.split('\n');
-    let linesToKeep = '';
-    for (const line of lines) {
-        // check for enableJetifier
-        const podfileMatch = line.match(/.+Podfile\.lock/) || [];
-        if (podfileMatch.length == 0) {
-            linesToKeep += line + '\n';
-        }
-    }
-    (0, utils_fs_1.writeFileSync)(filename, linesToKeep, { encoding: 'utf-8' });
-}
-async function updateAppIcons(config) {
-    const iconToKeep = 'AppIcon-512@2x.png';
-    const contentsFile = 'Contents.json';
-    const newContentsFileContents = `{
-    "images" : [
-      {
-        "filename" : "${iconToKeep}",
-        "idiom" : "universal",
-        "platform" : "ios",
-        "size" : "1024x1024"
-      }
-    ],
-    "info" : {
-      "author" : "xcode",
-      "version" : 1
-    }
-}`;
-    const path = (0, path_1.join)(config.ios.platformDirAbs, 'App', 'App', 'Assets.xcassets', 'AppIcon.appiconset');
-    if (!(0, utils_fs_1.existsSync)(path)) {
-        log_1.logger.error(`Unable to find ${path}. Try updating it manually`);
-        return;
-    }
-    if (!(0, utils_fs_1.existsSync)((0, path_1.join)(path, iconToKeep))) {
-        log_1.logger.error(`Unable to find ${iconToKeep}. Try updating it manually`);
-        return;
-    }
-    if (!(0, utils_fs_1.existsSync)((0, path_1.join)(path, contentsFile))) {
-        log_1.logger.error(`Unable to find ${path}. Try updating it manually`);
-        return;
-    }
-    const filenames = (0, utils_fs_1.readdirSync)(path);
-    for (const filename of filenames) {
-        if (filename != iconToKeep && filename != contentsFile) {
-            (0, utils_fs_1.removeSync)((0, path_1.join)(path, filename));
-        }
-    }
-    (0, utils_fs_1.writeFileSync)((0, path_1.join)(path, contentsFile), newContentsFileContents);
-}
-async function updateGradleProperties(filename) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    const lines = txt.split('\n');
-    let linesToKeep = '';
-    for (const line of lines) {
-        // check for enableJetifier
-        const jetifierMatch = line.match(/android\.enableJetifier\s*=\s*true/) || [];
-        const commentMatch = line.match(/# Automatically convert third-party libraries to use AndroidX/) || [];
-        if (jetifierMatch.length == 0 && commentMatch.length == 0) {
-            linesToKeep += line + '\n';
-        }
-    }
-    (0, utils_fs_1.writeFileSync)(filename, linesToKeep, { encoding: 'utf-8' });
-}
 async function movePackageFromManifestToBuildGradle(manifestFilename, buildGradleFilename) {
     const manifestText = readFile(manifestFilename);
     const buildGradleText = readFile(buildGradleFilename);
@@ -497,8 +428,8 @@ async function movePackageFromManifestToBuildGradle(manifestFilename, buildGradl
 }
 async function updateBuildGradle(filename, variablesAndClasspaths) {
     // In build.gradle add dependencies:
-    // classpath 'com.android.tools.build:gradle:8.0.0'
-    // classpath 'com.google.gms:google-services:4.3.15'
+    // classpath 'com.android.tools.build:gradle:8.2.0-rc02'
+    // classpath 'com.google.gms:google-services:4.4.0'
     const txt = readFile(filename);
     if (!txt) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "5.5.2-nightly-20231108T150443.0",
+  "version": "6.0.0-alpha.2",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",