@capacitor-plus/cli 8.3.10 → 8.3.12

package/dist/android/run.js

@@ -30,7 +30,7 @@ async function runAndroid(config, { target: selectedTarget, targetName: selected
         }
     }
     const pathToApk = `${config.android.platformDirAbs}/${config.android.appDir}/build/outputs/apk${runFlavor !== '' ? '/' + runFlavor : ''}/debug`;
-    const apkName = (0, common_1.parseApkNameFromFlavor)(runFlavor);
+    const apkName = await (0, common_1.parseApkNameFromFlavor)(runFlavor, pathToApk);
     const apkPath = (0, path_1.resolve)(pathToApk, apkName);
     const nativeRunArgs = ['android', '--app', apkPath, '--target', target.id];
     if (selectedPorts) {

package/dist/common.js

@@ -438,7 +438,17 @@ async function checkJDKMajorVersion() {
     }
 }
 exports.checkJDKMajorVersion = checkJDKMajorVersion;
-function parseApkNameFromFlavor(flavor) {
+async function parseApkNameFromFlavor(flavor, pathToApk) {
+    var _a, _b;
+    if (!flavor) {
+        const metadataPath = (0, path_1.join)(pathToApk, 'output-metadata.json');
+        if (await (0, fs_extra_1.pathExists)(metadataPath)) {
+            const metadataContent = await (0, fs_extra_1.readJSON)(metadataPath);
+            const outputFile = (_b = (_a = metadataContent === null || metadataContent === void 0 ? void 0 : metadataContent.elements) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.outputFile;
+            if (outputFile)
+                return outputFile;
+        }
+    }
     let convertedName = flavor.replace(/([A-Z])/g, '-$1').toLowerCase();
     if (convertedName.startsWith('-'))
         convertedName = convertedName.replace('-', '');

package/dist/config.js

@@ -180,7 +180,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     if ((_d = extConfig.android) === null || _d === void 0 ? void 0 : _d.flavor) {
         apkPath = `${apkPath}/${(_e = extConfig.android) === null || _e === void 0 ? void 0 : _e.flavor}`;
     }
-    const apkName = (0, common_1.parseApkNameFromFlavor)(flavor);
+    const apkName = await (0, common_1.parseApkNameFromFlavor)(flavor, `${platformDirAbs}/${apkPath}debug`);
     const buildOutputDir = `${apkPath}/debug`;
     const cordovaPluginsDir = 'capacitor-cordova-android-plugins';
     const studioPath = (0, promise_1.lazy)(() => determineAndroidStudioPath(cliConfig.os));

package/dist/ios/update.js

@@ -55,9 +55,9 @@ async function updatePluginFiles(config, plugins, deployment) {
     (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
 }
 async function generateCordovaPackageFiles(cordovaPlugins, config) {
-    cordovaPlugins.map((plugin) => {
-        generateCordovaPackageFile(plugin, config);
-    });
+    await Promise.all(cordovaPlugins.map((plugin) => {
+        return generateCordovaPackageFile(plugin, config);
+    }));
 }
 async function generateCordovaPackageFile(p, config) {
     var _a;
@@ -356,8 +356,8 @@ function isFramework(framework) {
 async function generateCordovaPodspecs(cordovaPlugins, config) {
     const staticPlugins = cordovaPlugins.filter((p) => (0, cordova_1.needsStaticPod)(p));
     const noStaticPlugins = cordovaPlugins.filter((el) => !staticPlugins.includes(el));
-    generateCordovaPodspec(noStaticPlugins, config, false);
-    generateCordovaPodspec(staticPlugins, config, true);
+    await generateCordovaPodspec(noStaticPlugins, config, false);
+    await generateCordovaPodspec(staticPlugins, config, true);
 }
 async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
     const weakFrameworks = [];
@@ -508,7 +508,7 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
     const isSPM = (await config.ios.packageManager) === 'SPM';
     for (const p of cordovaPlugins) {
         const platformTag = (0, plugin_1.getPluginPlatform)(p, platform);
-        if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+        if (isSPM && ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package)) {
             continue;
         }
         const sourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'source-file');

package/dist/util/spm.js

@@ -86,7 +86,7 @@ exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
-    const iosVersion = (0, common_2.getMajoriOSVersion)(config);
+    const iosVersion = (0, common_2.getMajorMinoriOSVersion)(config);
     const packageTraits = (_d = (_c = (_b = (_a = config.app.extConfig.experimental) === null || _a === void 0 ? void 0 : _a.ios) === null || _b === void 0 ? void 0 : _b.spm) === null || _c === void 0 ? void 0 : _c.packageTraits) !== null && _d !== void 0 ? _d : {};
     const swiftToolsVersion = (_h = (_g = (_f = (_e = config.app.extConfig.experimental) === null || _e === void 0 ? void 0 : _e.ios) === null || _f === void 0 ? void 0 : _f.spm) === null || _g === void 0 ? void 0 : _g.swiftToolsVersion) !== null && _h !== void 0 ? _h : '5.9';
     let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.3.10",
+  "version": "8.3.12",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",