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

package/dist/android/update.js

@@ -209,7 +209,7 @@ 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.2.20';
+    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 = [];

package/dist/config.js

@@ -194,7 +194,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     };
     return {
         name,
-        minVersion: '24',
+        minVersion: '26',
         studioPath,
         platformDir,
         platformDirAbs,

package/dist/ios/update.js

@@ -4,6 +4,7 @@ exports.installCocoaPodsPlugins = exports.updateIOS = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const semver_1 = require("semver");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
@@ -11,6 +12,7 @@ const errors_1 = require("../errors");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const copy_1 = require("../tasks/copy");
+const migrate_1 = require("../tasks/migrate");
 const cordova_ios_1 = require("../util/cordova-ios");
 const fs_1 = require("../util/fs");
 const iosplugin_1 = require("../util/iosplugin");
@@ -47,6 +49,22 @@ async function updatePluginFiles(config, plugins, deployment) {
             await (0, cordova_ios_1.generateCordovaPackageFiles)(cordovaPlugins, config);
         }
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
+        await Promise.all(validSPMPackages.map(async (plugin) => {
+            var _a;
+            const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+            const packageSwiftPath = (0, path_1.join)(plugin.rootPath, 'Package.swift');
+            let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
+            const regex = new RegExp('url:\\s*"https://github.com/ionic-team/capacitor-swift-pm\\.git",\\s*from:\\s*"([^"]+)"');
+            const version = (_a = content.match(regex)) === null || _a === void 0 ? void 0 : _a[1];
+            const majorCapVersion = (0, semver_1.major)(iosPlatformVersion);
+            if (version && (0, semver_1.major)(version) != majorCapVersion) {
+                const preCapVersion = (0, semver_1.prerelease)(iosPlatformVersion);
+                const forceVersion = preCapVersion ? iosPlatformVersion : `${majorCapVersion}.0.0`;
+                content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${forceVersion}"`);
+                await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
+                log_1.logger.warn(`${plugin.id} is built for Capacitor ${(0, semver_1.major)(version)}, it might cause issues`);
+            }
+        }));
         await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));
     }
     else {

package/dist/tasks/migrate.js

@@ -46,9 +46,9 @@ const plugins = [
 ];
 const coreVersion = '^8.0.0';
 const pluginVersion = '^8.0.0';
-const gradleVersion = '8.14.3';
+const gradleVersion = '9.5.1';
 const iOSVersion = '16';
-const kotlinVersion = '2.2.20';
+const kotlinVersion = '2.4.0';
 let installFailed = false;
 async function migrateCommand(config, noprompt, packagemanager) {
     if (config === null) {
@@ -74,7 +74,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
     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 16 (SDK 36). \n`, {
+        : await (0, log_1.logPrompt)(`Capacitor 8 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)`,

package/dist/util/cordova-ios.js

@@ -7,6 +7,7 @@ const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const common_2 = require("../ios/common");
 const plugin_1 = require("../plugin");
+const migrate_1 = require("../tasks/migrate");
 const template_1 = require("../util/template");
 const platform = 'ios';
 async function generateCordovaPodspecs(cordovaPlugins, config) {
@@ -321,6 +322,7 @@ async function generateCordovaPackageFiles(cordovaPlugins, config) {
 }
 exports.generateCordovaPackageFiles = generateCordovaPackageFiles;
 async function generateCordovaPackageFile(p, config) {
+    var _a;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
     const headerFiles = (0, plugin_1.getPlatformElement)(p, platform, 'header-file');
@@ -329,7 +331,16 @@ async function generateCordovaPackageFile(p, config) {
         headersText = `,
             publicHeadersPath: "."`;
     }
-    const content = `// swift-tools-version: 5.9
+    const platformTag = (0, plugin_1.getPluginPlatform)(p, platform);
+    if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+        const packageSwiftPath = (0, path_1.join)(p.rootPath, 'Package.swift');
+        let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
+        content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, `capacitor-swift-pm`);
+        content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${iosPlatformVersion}"`);
+        await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
+    }
+    else {
+        const content = `// swift-tools-version: 5.9
 
 import PackageDescription
 
@@ -355,6 +366,7 @@ let package = Package(
         )
     ]
 )`;
-    await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
+        await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
+    }
 }
 exports.generateCordovaPackageFile = generateCordovaPackageFile;

package/dist/util/spm.js

@@ -149,9 +149,9 @@ let package = Package(
         .target(
             name: "CapApp-SPM",
             dependencies: [
-                .product(name: "Capacitor", package: "capacitor-swift-pm"),`;
+                .product(name: "Capacitor", package: "capacitor-swift-pm")`;
     if (enableCordova) {
-        packageSwiftText += `                .product(name: "Cordova", package: "capacitor-swift-pm")`;
+        packageSwiftText += `,\n                .product(name: "Cordova", package: "capacitor-swift-pm")`;
     }
     for (const plugin of plugins) {
         const aliases = Object.entries((_r = (_q = packageOptions[plugin.id]) === null || _q === void 0 ? void 0 : _q.moduleAliases) !== null && _r !== void 0 ? _r : {});

package/package.json

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