Skip to content

fix(cli): mark Cordova CocoaPods plugins as incompatible in SPM #8463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcesarmobile wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

fix(cli): mark Cordova CocoaPods plugins as incompatible in SPM #8463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions cli/src/ios/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,14 @@ export async function updateIOS(config: Config, deployment: boolean): Promise<vo
}

async function updatePluginFiles(config: Config, plugins: Plugin[], deployment: boolean) {
const isSPM = (await config.ios.packageManager) === 'SPM';
await removePluginsNativeFiles(config);
const cordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Cordova);
let cordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Cordova);
let incompatibleCordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Incompatible);
if (isSPM) {
incompatibleCordovaPlugins = incompatibleCordovaPlugins.concat(cordovaPlugins.filter((p) => needsSPMDep(p)));
cordovaPlugins = cordovaPlugins.filter((p) => !needsSPMDep(p));
}
if (cordovaPlugins.length > 0) {
await copyPluginsNativeFiles(config, cordovaPlugins);
}
Expand All @@ -54,7 +60,7 @@ async function updatePluginFiles(config: Config, plugins: Plugin[], deployment:
}
await handleCordovaPluginsJS(cordovaPlugins, config, platform);
await checkPluginDependencies(plugins, platform, config.app.extConfig.cordova?.failOnUninstalledPlugins);
if ((await config.ios.packageManager) === 'SPM') {
if (isSPM) {
await generateCordovaPackageFiles(cordovaPlugins, config);

const validSPMPackages = await checkPluginsForPackageSwift(config, plugins);
Expand All @@ -66,7 +72,6 @@ async function updatePluginFiles(config: Config, plugins: Plugin[], deployment:
}
await logCordovaManualSteps(cordovaPlugins, config, platform);

const incompatibleCordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Incompatible);
printPlugins(incompatibleCordovaPlugins, platform, 'incompatible');
}

Expand Down Expand Up @@ -677,3 +682,9 @@ async function replaceFrameworkVariables(config: Config, prefsArray: any[], fram
});
return frameworkString;
}

function needsSPMDep(plugin: Plugin): boolean {
const podspecs = getPlatformElement(plugin, 'ios', 'podspec');
const platformTag = getPluginPlatform(plugin, platform);
return podspecs.length > 0 && !platformTag.$?.package;
}
Loading