@capacitor/cli 6.0.0-rc.1 → 6.0.0

package/dist/android/build.js

@@ -67,7 +67,7 @@ async function signWithApkSigner(config, buildOptions, releasePath, signedReleas
         signingArgs.push('--ks-key-alias', buildOptions.keystorealias);
     }
     if (buildOptions.keystorealiaspass) {
-        signingArgs.push('--key-pass', buildOptions.keystorealiaspass);
+        signingArgs.push('--key-pass', `pass:${buildOptions.keystorealiaspass}`);
     }
     await (0, common_1.runTask)('Signing Release', async () => {
         await (0, subprocess_1.runCommand)('apksigner', signingArgs, {

package/dist/common.js

@@ -392,7 +392,7 @@ async function checkJDKMajorVersion() {
 }
 exports.checkJDKMajorVersion = checkJDKMajorVersion;
 function parseApkNameFromFlavor(flavor) {
-    const convertedName = flavor.replace(/([A-Z])/g, '-$1').toLowerCase();
+    const convertedName = flavor.replace(/([A-Z])/g, '$1').toLowerCase();
     return `app-${convertedName ? `${convertedName}-` : ''}debug.apk`;
 }
 exports.parseApkNameFromFlavor = parseApkNameFromFlavor;

package/dist/index.js

@@ -153,7 +153,7 @@ function runProgram(config) {
     commander_1.program
         .command('add [platform]')
         .description('add a native platform project')
-        .option('--packagemanager <packageManager>', 'The package manager to use for dependency installs (SPM, Cocoapods)')
+        .option('--packagemanager <packageManager>', 'The package manager to use for dependency installs (Cocoapods, SPM **experimental**)')
         .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { packagemanager }) => {
         (0, config_1.checkExternalConfig)(config.app);
         const { addCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));

package/dist/ios/update.js

@@ -28,7 +28,7 @@ async function updateIOS(config, deployment) {
     else {
         await updateIOSCocoaPods(config, plugins, deployment);
     }
-    generateIOSPackageJSON(config, plugins);
+    (0, iosplugin_1.generateIOSPackageJSON)(config, plugins);
     (0, plugin_1.printPlugins)(capacitorPlugins, 'ios');
 }
 exports.updateIOS = updateIOS;
@@ -100,11 +100,6 @@ end`, `require_relative '${relativeCapacitoriOSPath}/scripts/pods_helpers'`);
         log_1.logger.warn('Unable to find "xcodebuild". Skipping xcodebuild clean step...');
     }
 }
-async function generateIOSPackageJSON(config, plugins) {
-    const fileList = await (0, iosplugin_1.getPluginFiles)(plugins);
-    const classList = await (0, iosplugin_1.findPluginClasses)(fileList);
-    (0, iosplugin_1.writePluginJSON)(config, classList);
-}
 async function getRelativeCapacitoriOSPath(config) {
     const capacitoriOSPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/ios', 'package.json');
     if (!capacitoriOSPath) {

package/dist/tasks/copy.js

@@ -8,8 +8,10 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
+const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
+const iosplugin_1 = require("../util/iosplugin");
 const promise_1 = require("../util/promise");
 const copy_1 = require("../web/copy");
 const sourcemaps_1 = require("./sourcemaps");
@@ -80,6 +82,8 @@ async function copy(config, platformName, inline = false) {
             await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
             const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
             await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platformName);
+            const iosPlugins = await (0, common_2.getIOSPlugins)(allPlugins);
+            await (0, iosplugin_1.generateIOSPackageJSON)(config, iosPlugins);
         }
         else if (platformName === config.android.name) {
             if (usesFederatedCapacitor) {

package/dist/tasks/migrate.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
 const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+const semver_1 = require("semver");
 const common_1 = require("../android/common");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_2 = require("../common");
@@ -34,7 +35,6 @@ const plugins = [
     '@capacitor/dialog',
     '@capacitor/filesystem',
     '@capacitor/geolocation',
-    '@capacitor/google-maps',
     '@capacitor/haptics',
     '@capacitor/keyboard',
     '@capacitor/local-notifications',
@@ -50,8 +50,8 @@ const plugins = [
     '@capacitor/text-zoom',
     '@capacitor/toast',
 ];
-const coreVersion = 'next';
-const pluginVersion = 'next';
+const coreVersion = '^6.0.0';
+const pluginVersion = '^6.0.0';
 const gradleVersion = '8.2.1';
 let installFailed = false;
 async function migrateCommand(config, noprompt, packagemanager) {
@@ -74,7 +74,7 @@ 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 enviroment, please check out the Ionic vscode extension for this functionality.';
+    const monorepoWarning = 'Please note this tool is not intended for use in a mono-repo environment, please check out the Ionic vscode extension for this functionality.';
     log_1.logger.info(monorepoWarning);
     const { migrateconfirm } = noprompt
         ? { migrateconfirm: 'y' }
@@ -89,7 +89,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
         try {
             const { depInstallConfirm } = noprompt
                 ? { depInstallConfirm: 'y' }
-                : await (0, log_1.logPrompt)(`Would you like the migrator to run npm, yarn, or pnpm install to install the latest versions of capacitor packages? (Those using other package managers should answer N)`, {
+                : await (0, log_1.logPrompt)(`Would you like the migrator to run npm, yarn, pnpm, or bun install to install the latest versions of capacitor packages? (Those using other package managers should answer N)`, {
                     type: 'text',
                     name: 'depInstallConfirm',
                     message: `Run Dependency Install? (Y/n)`,
@@ -109,6 +109,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                             { title: 'NPM', value: 'npm' },
                             { title: 'Yarn', value: 'yarn' },
                             { title: 'PNPM', value: 'pnpm' },
+                            { title: 'Bun', value: 'bun' },
                         ],
                         initial: 0,
                     });
@@ -134,6 +135,25 @@ async function migrateCommand(config, noprompt, packagemanager) {
             }
             if (allDependencies['@capacitor/android'] &&
                 (0, utils_fs_1.existsSync)(config.android.platformDirAbs)) {
+                const gradleWrapperVersion = getGradleWrapperVersion((0, path_1.join)(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'));
+                if (!installFailed && (0, semver_1.gt)(gradleVersion, gradleWrapperVersion)) {
+                    try {
+                        await (0, common_2.runTask)(`Upgrading gradle wrapper files`, () => {
+                            return updateGradleWrapperFiles(config.android.platformDirAbs);
+                        });
+                    }
+                    catch (e) {
+                        if (e.includes('EACCES')) {
+                            log_1.logger.error(`gradlew file does not have executable permissions. This can happen if the Android platform was added on a Windows machine. Please run ${colors_1.default.input(`chmod +x ./${config.android.platformDir}/gradlew`)} and ${colors_1.default.input(`cd ${config.android.platformDir} && ./gradlew wrapper --distribution-type all --gradle-version ${gradleVersion} --warning-mode all`)} to update the files manually`);
+                        }
+                        else {
+                            log_1.logger.error(`gradle wrapper files were not updated`);
+                        }
+                    }
+                }
+                else {
+                    log_1.logger.warn('Skipped upgrading gradle wrapper files');
+                }
                 await (0, common_2.runTask)(`Migrating build.gradle file.`, () => {
                     return updateBuildGradle((0, path_1.join)(config.android.platformDirAbs, 'build.gradle'), variablesAndClasspaths);
                 });
@@ -153,10 +173,6 @@ async function migrateCommand(config, noprompt, packagemanager) {
                         }
                     })();
                 });
-                // Update gradle-wrapper.properties
-                await (0, common_2.runTask)(`Migrating gradle-wrapper.properties by updating gradle version to ${gradleVersion}.`, () => {
-                    return updateGradleWrapper((0, path_1.join)(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'));
-                });
                 // Variables gradle
                 await (0, common_2.runTask)(`Migrating variables.gradle file.`, () => {
                     return (async () => {
@@ -217,27 +233,6 @@ async function migrateCommand(config, noprompt, packagemanager) {
             else {
                 log_1.logger.warn('Skipped Running cap sync.');
             }
-            if (allDependencies['@capacitor/android'] &&
-                (0, utils_fs_1.existsSync)(config.android.platformDirAbs)) {
-                if (!installFailed) {
-                    try {
-                        await (0, common_2.runTask)(`Upgrading gradle wrapper files`, () => {
-                            return updateGradleWrapperFiles(config.android.platformDirAbs);
-                        });
-                    }
-                    catch (e) {
-                        if (e.includes('EACCES')) {
-                            log_1.logger.error(`gradlew file does not have executable permissions. This can happen if the Android platform was added on a Windows machine. Please run ${colors_1.default.input(`chmod +x ./${config.android.platformDir}/gradlew`)} and ${colors_1.default.input(`cd ${config.android.platformDir} && ./gradlew wrapper --distribution-type all --gradle-version ${gradleVersion} --warning-mode all`)} to update the files manually`);
-                        }
-                        else {
-                            log_1.logger.error(`gradle wrapper files were not updated`);
-                        }
-                    }
-                }
-                else {
-                    log_1.logger.warn('Skipped upgrading gradle wrapper files');
-                }
-            }
             // Write all breaking changes
             await (0, common_2.runTask)(`Writing breaking changes.`, () => {
                 return writeBreakingChanges();
@@ -367,15 +362,15 @@ function readFile(filename) {
         log_1.logger.error(`Unable to read ${filename}. Verify it is not already open. ${err}`);
     }
 }
-async function updateGradleWrapper(filename) {
+function getGradleWrapperVersion(filename) {
+    var _a;
     const txt = readFile(filename);
     if (!txt) {
-        return;
+        return '0.0.0';
     }
-    const replaced = setAllStringIn(txt, 'distributionUrl=', '\n', 
-    // eslint-disable-next-line no-useless-escape
-    `https\\://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip`);
-    (0, utils_fs_1.writeFileSync)(filename, replaced, 'utf-8');
+    const version = txt.substring(txt.indexOf('gradle-') + 7, txt.indexOf('-all.zip'));
+    const semverVersion = (_a = (0, semver_1.coerce)(version)) === null || _a === void 0 ? void 0 : _a.version;
+    return semverVersion ? semverVersion : '0.0.0';
 }
 async function updateGradleWrapperFiles(platformDir) {
     await (0, subprocess_1.runCommand)(`./gradlew`, [
@@ -443,10 +438,9 @@ async function updateBuildGradle(filename, variablesAndClasspaths) {
     let replaced = txt;
     for (const dep of Object.keys(neededDeps)) {
         if (replaced.includes(`classpath '${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)) {
+            if ((0, semver_1.gte)(neededDeps[dep], existingVersion)) {
                 replaced = setAllStringIn(replaced, `classpath '${dep}:`, `'`, neededDeps[dep]);
                 log_1.logger.info(`Set ${dep} = ${neededDeps[dep]}.`);
             }

package/dist/util/iosplugin.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writePluginJSON = exports.findPluginClasses = exports.getPluginFiles = void 0;
+exports.generateIOSPackageJSON = exports.writePluginJSON = exports.findPluginClasses = exports.getPluginFiles = void 0;
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
+const cordova_1 = require("../cordova");
+const plugin_1 = require("../plugin");
 async function getPluginFiles(plugins) {
-    var _a, _b;
+    var _a;
     let filenameList = [];
     const options = {
         filter: item => {
@@ -17,8 +19,8 @@ async function getPluginFiles(plugins) {
         },
     };
     for (const plugin of plugins) {
-        if (typeof ((_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name) !== 'undefined') {
-            const pluginPath = (0, path_1.resolve)(plugin.rootPath, (_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.path);
+        if (plugin.ios && (0, plugin_1.getPluginType)(plugin, 'ios') === 0 /* PluginType.Core */) {
+            const pluginPath = (0, path_1.resolve)(plugin.rootPath, (_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.path);
             const filenames = await (0, utils_fs_1.readdirp)(pluginPath, options);
             filenameList = filenameList.concat(filenames);
         }
@@ -51,3 +53,13 @@ async function writePluginJSON(config, classList) {
     (0, utils_fs_1.writeJSONSync)(capJSONFile, capJSON, { spaces: '\t' });
 }
 exports.writePluginJSON = writePluginJSON;
+async function generateIOSPackageJSON(config, plugins) {
+    const fileList = await getPluginFiles(plugins);
+    const classList = await findPluginClasses(fileList);
+    const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
+    if (cordovaPlugins.length > 0) {
+        classList.push('CDVPlugin');
+    }
+    writePluginJSON(config, classList);
+}
+exports.generateIOSPackageJSON = generateIOSPackageJSON;

package/dist/util/spm.js

@@ -20,6 +20,7 @@ exports.findPackageSwiftFile = findPackageSwiftFile;
 async function generatePackageFile(config, plugins) {
     const packageSwiftFile = await findPackageSwiftFile(config);
     try {
+        log_1.logger.warn('SPM Support is still experimental');
         const textToWrite = generatePackageText(config, plugins);
         (0, utils_fs_1.writeFileSync)(packageSwiftFile, textToWrite);
     }
@@ -43,7 +44,7 @@ let package = Package(
             targets: ["CapApp-SPM"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main")`;
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main")`;
     for (const plugin of plugins) {
         const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
         packageSwiftText += `,\n        .package(name: "${(_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name}", path: "${relPath}")`;
@@ -54,8 +55,8 @@ let package = Package(
         .target(
             name: "CapApp-SPM",
             dependencies: [
-                .product(name: "Capacitor", package: "capacitor-spm"),
-                .product(name: "Cordova", package: "capacitor-spm")`;
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm")`;
     for (const plugin of plugins) {
         packageSwiftText += `,\n                .product(name: "${(_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.name}", package: "${(_c = plugin.ios) === null || _c === void 0 ? void 0 : _c.name}")`;
     }

package/package.json

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