@capacitor/cli 9.0.0-alpha.5 → 9.0.0-alpha.6

package/dist/android/update.js

@@ -206,10 +206,7 @@ if (hasProperty('postBuildExtras')) {
 }
 exports.installGradlePlugins = installGradlePlugins;
 async function handleCordovaPluginsGradle(config, cordovaPlugins) {
-    var _a, _b, _c;
     const pluginsGradlePath = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'build.gradle');
-    const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
-    const kotlinVersionString = (_c = (_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinVersion) !== null && _c !== void 0 ? _c : '2.4.0';
     const frameworksArray = [];
     let prefsArray = [];
     const applyArray = [];
@@ -241,21 +238,10 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     })
         .join('\n');
     frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);
-    if (kotlinNeeded) {
-        frameworkString += `\n    implementation "androidx.core:core-ktx:$androidxCoreKTXVersion"`;
-        frameworkString += `\n    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`;
-    }
     const applyString = applyArray.join('\n');
     let buildGradle = await (0, fs_extra_1.readFile)(pluginsGradlePath, { encoding: 'utf-8' });
     buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + frameworkString.concat('\n') + '    $2');
     buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + applyString.concat('\n') + '$2');
-    if (kotlinNeeded) {
-        buildGradle = buildGradle.replace(/(buildscript\s{\n(\t|\s{4})repositories\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})}\n(\t|\s{4})dependencies\s{\n(\t{2}|\s{8}).+)\n((\t|\s{4})}\n}\n)/, `$1\n        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"\n$8`);
-        buildGradle = buildGradle.replace(/(ext\s{)/, `$1\n    androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.8.0'`);
-        buildGradle = buildGradle.replace(/(buildscript\s{)/, `$1\n    ext.kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'`);
-        buildGradle = buildGradle.replace(/(apply\splugin:\s'com\.android\.library')/, `$1\napply plugin: 'kotlin-android'`);
-        buildGradle = buildGradle.replace(/(compileOptions\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})})\n(})/, `$1\n    sourceSets {\n        main.java.srcDirs += 'src/main/kotlin'\n    }\n$5`);
-    }
     await (0, fs_extra_1.writeFile)(pluginsGradlePath, buildGradle);
     const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 ext {
@@ -267,26 +253,6 @@ ext {
     await (0, fs_extra_1.writeFile)((0, path_1.join)(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
 }
 exports.handleCordovaPluginsGradle = handleCordovaPluginsGradle;
-async function kotlinNeededCheck(config, cordovaPlugins) {
-    var _a, _b;
-    if (((_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinEnabled) !== 'true') {
-        for (const plugin of cordovaPlugins) {
-            const androidPlatform = (0, plugin_1.getPluginPlatform)(plugin, platform);
-            const sourceFiles = androidPlatform['source-file'];
-            if (sourceFiles) {
-                for (const srcFile of sourceFiles) {
-                    if (/^.*\.kt$/.test(srcFile['$'].src)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    else {
-        return true;
-    }
-}
 async function copyPluginsNativeFiles(config, cordovaPlugins) {
     const pluginsPath = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'src', 'main');
     for (const p of cordovaPlugins) {

package/dist/tasks/migrate.js

@@ -4,7 +4,7 @@ exports.setAllStringIn = exports.migrateCommand = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const semver_1 = require("semver");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
@@ -44,23 +44,22 @@ const plugins = [
     '@capacitor/text-zoom',
     '@capacitor/toast',
 ];
-const coreVersion = '^8.0.0';
-const pluginVersion = '^8.0.0';
+const coreVersion = 'next';
+const pluginVersion = 'next';
 const gradleVersion = '9.5.1';
 const iOSVersion = '16';
-const kotlinVersion = '2.4.0';
 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 < 7) {
-        (0, errors_1.fatal)('Migrate can only be used on Capacitor 7, please use the CLI in Capacitor 7 to upgrade to 7 first');
+    if (capMajor < 8) {
+        (0, errors_1.fatal)('Migrate can only be used on Capacitor 8, please use the CLI in Capacitor 8 to upgrade to 8 first');
     }
     const jdkMajor = await (0, common_1.checkJDKMajorVersion)();
     if (jdkMajor < 21) {
-        log_1.logger.warn('Capacitor 8 requires JDK 21 or higher. Some steps may fail.');
+        log_1.logger.warn('Capacitor 9 requires JDK 21 or higher. Some steps may fail.');
     }
     const variablesAndClasspaths = await getAndroidVariablesAndClasspaths(config);
     if (!variablesAndClasspaths) {
@@ -70,11 +69,11 @@ async function migrateCommand(config, noprompt, packagemanager) {
         ...config.app.package.dependencies,
         ...config.app.package.devDependencies,
     };
-    const monorepoWarning = 'Please note this tool is not intended for use in a mono-repo environment, you should migrate manually instead. Refer to https://capacitorjs.com/docs/next/updating/8-0';
+    const monorepoWarning = 'Please note this tool is not intended for use in a mono-repo environment, you should migrate manually instead. Refer to https://capacitorjs.com/docs/next/updating/9-0';
     log_1.logger.info(monorepoWarning);
     const { migrateconfirm } = noprompt
         ? { migrateconfirm: 'y' }
-        : await (0, log_1.logPrompt)(`Capacitor 8 sets a deployment target of iOS ${iOSVersion} and Android 17 (SDK 37). \n`, {
+        : await (0, log_1.logPrompt)(`Capacitor 9 sets a deployment target of iOS ${iOSVersion} and Android 17 (SDK 37). \n`, {
             type: 'text',
             name: 'migrateconfirm',
             message: `Are you sure you want to migrate? (Y/n)`,
@@ -136,6 +135,9 @@ async function migrateCommand(config, noprompt, packagemanager) {
                 else {
                     log_1.logger.warn('Skipped updating deployment target');
                 }
+                await (0, common_1.runTask)(`Migrating AppDelegate.swift`, () => {
+                    return updateAppDelegate((0, path_1.join)(config.ios.nativeTargetDirAbs, 'AppDelegate.swift'));
+                });
             }
             if (!installFailed) {
                 await (0, common_1.runTask)(`Running cap sync.`, () => {
@@ -179,6 +181,19 @@ async function migrateCommand(config, noprompt, packagemanager) {
                 await (0, common_1.runTask)(`Migrating app build.gradle file.`, () => {
                     return updateAppBuildGradle((0, path_1.join)(config.android.appDirAbs, 'build.gradle'));
                 });
+                // settings.gradle
+                await (0, common_1.runTask)(`Migrating settings.gradle file.`, () => {
+                    return (async () => {
+                        const settingsPath = (0, path_1.join)(config.android.platformDirAbs, 'settings.gradle');
+                        let txt = readFile(settingsPath);
+                        if (!txt) {
+                            return;
+                        }
+                        txt = txt.replace(`include ':capacitor-cordova-android-plugins'\n`, '');
+                        txt = txt.replace(`project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')\n`, '');
+                        (0, fs_extra_1.writeFileSync)(settingsPath, txt, { encoding: 'utf-8' });
+                    })();
+                });
                 // Variables gradle
                 await (0, common_1.runTask)(`Migrating variables.gradle file.`, () => {
                     return (async () => {
@@ -233,7 +248,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                         }
                     })();
                 });
-                rimraf_1.default.sync((0, path_1.join)(config.android.appDirAbs, 'build'));
+                rimraf_1.rimraf.sync((0, path_1.join)(config.android.appDirAbs, 'build'));
             }
             // Write all breaking changes
             await (0, common_1.runTask)(`Writing breaking changes.`, () => {
@@ -273,7 +288,9 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
         if (libs.includes(devDepKey)) {
             pkgJson['devDependencies'][devDepKey] = coreVersion;
         }
-        else if (plugins.includes(devDepKey)) {
+        else if (plugins.includes(devDepKey) &&
+            !(pkgJson['devDependencies'][devDepKey].startsWith('file:') ||
+                pkgJson['devDependencies'][devDepKey].startsWith('workspace:'))) {
             pkgJson['devDependencies'][devDepKey] = pluginVersion;
         }
     }
@@ -281,7 +298,8 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
         if (libs.includes(depKey)) {
             pkgJson['dependencies'][depKey] = coreVersion;
         }
-        else if (plugins.includes(depKey)) {
+        else if (plugins.includes(depKey) &&
+            !(pkgJson['dependencies'][depKey].startsWith('file:') || pkgJson['dependencies'][depKey].startsWith('workspace:'))) {
             pkgJson['dependencies'][depKey] = pluginVersion;
         }
     }
@@ -289,7 +307,7 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
         encoding: 'utf-8',
     });
     if (runInstall) {
-        rimraf_1.default.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
+        rimraf_1.rimraf.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
         await (0, subprocess_1.runCommand)(dependencyManager, ['install']);
         if (dependencyManager == 'yarn') {
             await (0, subprocess_1.runCommand)(dependencyManager, ['upgrade']);
@@ -303,18 +321,7 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
     }
 }
 async function writeBreakingChanges() {
-    const breaking = [
-        '@capacitor/action-sheet',
-        '@capacitor/barcode-scanner',
-        '@capacitor/browser',
-        '@capacitor/camera',
-        '@capacitor/geolocation',
-        '@capacitor/google-maps',
-        '@capacitor/push-notifications',
-        '@capacitor/screen-orientation',
-        '@capacitor/splash-screen',
-        '@capacitor/status-bar',
-    ];
+    const breaking = ['@capacitor/push-notifications', '@capacitor/splash-screen'];
     const broken = [];
     for (const lib of breaking) {
         if (allDependencies[lib]) {
@@ -322,7 +329,7 @@ async function writeBreakingChanges() {
         }
     }
     if (broken.length > 0) {
-        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/next/updating/8-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
+        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/next/updating/9-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
     }
 }
 async function getAndroidVariablesAndClasspaths(config) {
@@ -402,38 +409,24 @@ async function updateBuildGradle(filename, variablesAndClasspaths) {
             }
         }
     }
-    const beforeKotlinVersionUpdate = replaced;
-    replaced = replaceVersion(replaced, /(ext\.kotlin_version\s*=\s*['"])([^'"]+)(['"])/, kotlinVersion);
-    replaced = replaceVersion(replaced, /(org\.jetbrains\.kotlin:kotlin[^:]*:)([\d.]+)(['"])/, kotlinVersion);
-    if (beforeKotlinVersionUpdate !== replaced) {
-        log_1.logger.info(`Set Kotlin version to ${kotlinVersion}`);
-    }
     (0, fs_extra_1.writeFileSync)(filename, replaced, 'utf-8');
 }
-function replaceVersion(text, regex, newVersion) {
-    return text.replace(regex, (match, prefix, currentVersion, suffix) => {
-        var _a;
-        const semVer = (_a = (0, semver_1.coerce)(currentVersion)) === null || _a === void 0 ? void 0 : _a.version;
-        if ((0, semver_1.gte)(newVersion, semVer ? semVer : '0.0.0')) {
-            return `${prefix || ''}${newVersion}${suffix || ''}`;
-        }
-        return match;
-    });
-}
 async function updateAppBuildGradle(filename) {
     const txt = readFile(filename);
     if (!txt) {
         return;
     }
     let replaced = txt;
-    const gradlePproperties = ['compileSdk', 'namespace', 'ignoreAssetsPattern'];
-    for (const prop of gradlePproperties) {
-        // Use updated Groovy DSL syntax with " = " assignment
-        const regex = new RegExp(`(^\\s*${prop})\\s+(?!=)(.+)$`, 'gm');
-        replaced = replaced.replace(regex, (_match, key, value) => {
-            return `${key} = ${value.trim()}`;
-        });
+    replaced = replaced.replace(`proguard-android.txt`, `proguard-android-optimize.txt`);
+    replaced = replaced.replace('        targetSdkVersion rootProject.ext.targetSdkVersion\n', '');
+    replaced = replaced.replace(`    implementation project(':capacitor-cordova-android-plugins')\n`, '');
+    replaced = replaced.replace(`repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
     }
+}
+
+`, '');
     (0, fs_extra_1.writeFileSync)(filename, replaced, 'utf-8');
 }
 async function updateFile(config, filename, textStart, textEnd, replacement, skipIfNotFound) {
@@ -517,3 +510,19 @@ async function updateAndroidManifest(filename) {
         (0, fs_extra_1.writeFileSync)(filename, replaced, 'utf-8');
     }
 }
+async function updateAppDelegate(filename) {
+    const txt = readFile(filename);
+    if (!txt) {
+        return;
+    }
+    if (txt.includes('@main')) {
+        return; // Probably already updated
+    }
+    const replaced = txt.replace('@UIApplicationMain', '@main');
+    if (!replaced.includes('@main')) {
+        log_1.logger.error(`Unable to replace @UIApplicationMain to @main in ${filename}. Try replacing it manually`);
+    }
+    else {
+        (0, fs_extra_1.writeFileSync)(filename, replaced, 'utf-8');
+    }
+}

package/package.json

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