Skip to content

fix: add missing logic from merge #8515

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

Merged
markemer merged 2 commits into from
Jun 23, 2026
+18 −2
Merged

fix: add missing logic from merge #8515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baf30f9
fix: add missing logic from merge
markemer Jun 22, 2026
23ea299
npm run fmt
markemer Jun 22, 2026
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
20 changes: 18 additions & 2 deletions cli/src/util/cordova-ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
getPluginType,
} from '../plugin';
import type { Plugin } from '../plugin';
import { setAllStringIn } from '../tasks/migrate';
import { extractTemplate } from '../util/template';

const platform = 'ios';
Expand Down Expand Up @@ -352,7 +353,21 @@ export async function generateCordovaPackageFile(p: Plugin, config: Config): Pro
publicHeadersPath: "."`;
}

const content = `// swift-tools-version: 5.9
const platformTag = getPluginPlatform(p, platform);

if (platformTag.$?.package) {
const packageSwiftPath = join(p.rootPath, 'Package.swift');
let content = await readFile(packageSwiftPath, { encoding: 'utf-8' });
content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, `capacitor-swift-pm`);
content = setAllStringIn(
content,
`url: "https://github.com/ionic-team/capacitor-swift-pm.git",`,
`)`,
` from: "${iosPlatformVersion}"`,
);
await writeFile(packageSwiftPath, content);
} else {
const content = `// swift-tools-version: 5.9

import PackageDescription

Expand All @@ -378,5 +393,6 @@ let package = Package(
)
]
)`;
await writeFile(join(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
await writeFile(join(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
}
}
Loading