@capacitor/cli 8.0.0-alpha.1 → 8.0.0-alpha.3

package/dist/android/update.js

@@ -175,7 +175,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 : '1.9.25';
+    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 frameworksArray = [];
     let prefsArray = [];
     const applyArray = [];

package/dist/config.js

@@ -138,7 +138,7 @@ async function loadExtConfig(rootDir) {
 async function loadCLIConfig(rootDir) {
     const assetsDir = 'assets';
     const assetsDirAbs = (0, path_1.join)(rootDir, assetsDir);
-    const iosPlatformTemplateArchive = 'ios-pods-template.tar.gz';
+    const iosPlatformTemplateArchive = 'ios-spm-template.tar.gz';
     const iosCordovaPluginsTemplateArchive = 'capacitor-cordova-ios-plugins.tar.gz';
     const androidPlatformTemplateArchive = 'android-template.tar.gz';
     const androidCordovaPluginsTemplateArchive = 'capacitor-cordova-android-plugins.tar.gz';
@@ -334,8 +334,19 @@ async function determineAndroidStudioPath(os) {
             }
             return p;
         }
-        case "linux" /* OS.Linux */:
-            return '/usr/local/android-studio/bin/studio.sh';
+        case "linux" /* OS.Linux */: {
+            const studioExecPath = '/usr/local/android-studio/bin/studio';
+            const studioShPath = '/usr/local/android-studio/bin/studio.sh';
+            try {
+                if (await (0, fs_extra_1.pathExists)(studioExecPath)) {
+                    return studioExecPath;
+                }
+            }
+            catch (e) {
+                debug(`Error checking for studio executable: %O`, e);
+            }
+            return studioShPath;
+        }
     }
     return '';
 }

package/dist/declarations.d.ts

@@ -269,8 +269,8 @@ export interface CapacitorConfig {
         resolveServiceWorkerRequests?: boolean;
         /**
          * If set to "force", margins will be adjusted for edge to edge regardless of any other settings.
-         * If set to "auto", or is missing, will check for Android 15 and the setting of [windowOptOutEdgeToEdgeEnforcement](https://developer.android.com/reference/android/R.attr#windowOptOutEdgeToEdgeEnforcement) and will adjust margins if on Android 15 and windowOptOutEdgeToEdgeEnforcement is false/missing.
-         * If set to "disable", will not adjust margins at all.
+         * If set to "auto", will check for Android 15 and the setting of [windowOptOutEdgeToEdgeEnforcement](https://developer.android.com/reference/android/R.attr#windowOptOutEdgeToEdgeEnforcement) and will adjust margins if on Android 15 and windowOptOutEdgeToEdgeEnforcement is false/missing.
+         * If set to "disable", or is missing, will not adjust margins at all.
          * In Capacitor 8, this default will be changed to 'auto'
          *
          * @since 7.1.0

package/dist/index.js

@@ -179,8 +179,8 @@ function runProgram(config) {
         .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { packagemanager }) => {
         const { addCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));
         const configWritable = config;
-        if (packagemanager === 'SPM') {
-            configWritable.cli.assets.ios.platformTemplateArchive = 'ios-spm-template.tar.gz';
+        if ((packagemanager === null || packagemanager === void 0 ? void 0 : packagemanager.toLowerCase()) === 'CocoaPods'.toLowerCase()) {
+            configWritable.cli.assets.ios.platformTemplateArchive = 'ios-pods-template.tar.gz';
             configWritable.cli.assets.ios.platformTemplateArchiveAbs = (0, path_1.resolve)(configWritable.cli.assetsDirAbs, configWritable.cli.assets.ios.platformTemplateArchive);
         }
         await addCommand(configWritable, platform);

package/dist/ios/update.js

@@ -43,7 +43,7 @@ async function updatePluginFiles(config, plugins, deployment) {
     if ((await (0, spm_1.checkPackageManager)(config)) === 'SPM') {
         await generateCordovaPackageFiles(cordovaPlugins, config);
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
-        await (0, spm_1.generatePackageFile)(config, validSPMPackages);
+        await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));
     }
     else {
         await generateCordovaPodspecs(cordovaPlugins, config);

package/dist/util/spm.js

@@ -45,7 +45,7 @@ async function checkPluginsForPackageSwift(config, plugins) {
         log_1.logger.info('All plugins have a Package.swift file and will be included in Package.swift');
     }
     else {
-        log_1.logger.warn('Some installed packages my not be compatable with SPM');
+        log_1.logger.warn('Some installed packages are not compatable with SPM');
     }
     return packageSwiftPluginList;
 }

package/package.json

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