@capacitor-plus/cli 8.6.1 → 8.6.2

package/dist/ios/update.js

@@ -45,6 +45,25 @@ async function updatePluginFiles(config, plugins, deployment) {
     if ((await config.ios.packageManager) === 'SPM') {
         await 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];
+            if (!version || !(0, semver_1.valid)(version)) {
+                return;
+            }
+            const majorCapVersion = (0, semver_1.major)(iosPlatformVersion);
+            if ((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));
         if (validSPMPackages.length > 0) {
             let platformVersion;
@@ -560,7 +579,11 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                 fileName = 'lib' + fileName;
             }
             let destFolder = sourcesFolderName;
-            if (!isSPM && codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
+            if (!isSPM &&
+                fileExt !== 'a' &&
+                codeFile.$.framework !== 'true' &&
+                codeFile.$['compiler-flags'] &&
+                codeFile.$['compiler-flags'] === '-fno-objc-arc') {
                 destFolder = 'noarc';
             }
             const filePath = (0, plugin_1.getFilePath)(config, p, codeFile.$.src);
@@ -626,7 +649,15 @@ function filterResources(plugin) {
 }
 function filterARCFiles(plugin) {
     const sources = (0, plugin_1.getPlatformElement)(plugin, platform, 'source-file');
-    const sourcesARC = sources.filter((sourceFile) => sourceFile.$['compiler-flags'] && sourceFile.$['compiler-flags'] === '-fno-objc-arc');
+    const sourcesARC = sources.filter((sourceFile) => {
+        var _a;
+        const src = (_a = sourceFile.$.src) !== null && _a !== void 0 ? _a : '';
+        const ext = src.split('.').pop();
+        return (ext !== 'a' &&
+            sourceFile.$.framework !== 'true' &&
+            sourceFile.$['compiler-flags'] &&
+            sourceFile.$['compiler-flags'] === '-fno-objc-arc');
+    });
     return sourcesARC.length > 0;
 }
 function removeNoSystem(library, sourceFrameworks) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.6.1",
+  "version": "8.6.2",
   "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)",