-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: modify package.swift on update and sync (#7042)
- Loading branch information
Showing
102 changed files
with
172 additions
and
105,965 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| import { existsSync, readFileSync, writeFileSync } from '@ionic/utils-fs'; | ||
| import { relative, resolve } from 'path'; | ||
|
|
||
| import type { Config } from '../definitions'; | ||
| import { logger } from '../log'; | ||
| import type { Plugin } from '../plugin'; | ||
|
|
||
| export interface SwiftPlugin { | ||
| name: string; | ||
| path: string; | ||
| } | ||
|
|
||
| export async function findPackageSwiftFile(config: Config): Promise<string> { | ||
| const packageDirectory = resolve( | ||
| config.ios.nativeProjectDirAbs, | ||
| 'CapApp-SPM', | ||
| ); | ||
| return resolve(packageDirectory, 'Package.swift'); | ||
| } | ||
|
|
||
| function readSwiftPackage(packageLine: string): string | null { | ||
| const packageRegex = RegExp(/.package\(\s*name:\s*"([A-Za-z0-9_-]+)"/); | ||
| const lineMatch = packageLine.match(packageRegex); | ||
| if (lineMatch === null) { | ||
| return null; | ||
| } | ||
|
|
||
| return lineMatch[1]; | ||
| } | ||
|
|
||
| export async function generatePackageFile( | ||
| config: Config, | ||
| plugins: Plugin[], | ||
| ): Promise<void> { | ||
| const swiftPluginList: string[] = []; | ||
|
|
||
| for (const plugin of plugins) { | ||
| const relPath = relative(config.ios.nativeXcodeProjDirAbs, plugin.rootPath); | ||
| const pluginStatement = `.package(name: "${plugin.ios?.name}", path: "${relPath}"),`; | ||
| swiftPluginList.push(pluginStatement); | ||
| } | ||
|
|
||
| const packageSwiftFile = await findPackageSwiftFile(config); | ||
|
|
||
| try { | ||
| if (!existsSync(packageSwiftFile)) { | ||
| logger.error( | ||
| `Unable to find ${packageSwiftFile}. Try updating it manually`, | ||
| ); | ||
| } | ||
| const packageSwiftText = readFileSync(packageSwiftFile, 'utf-8'); | ||
| const packageSwiftTextLines = packageSwiftText.split('\n'); | ||
|
|
||
| let textToWrite = ''; | ||
| const packages: string[] = []; | ||
| for (const lineIndex in packageSwiftTextLines) { | ||
| const line = packageSwiftTextLines; | ||
| const index = parseInt(lineIndex); | ||
|
|
||
| if ( | ||
| line[index].includes('dependencies: [') && | ||
| line[index + 1].includes( | ||
| '.package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main")', | ||
| ) | ||
| ) { | ||
| let tempIndex = index + 1; | ||
| while (!line[tempIndex].includes('],')) { | ||
| const swiftPack = readSwiftPackage(line[tempIndex]); | ||
| if (swiftPack !== null) { | ||
| packages.push(swiftPack); | ||
| } | ||
| tempIndex++; | ||
| } | ||
| } | ||
|
|
||
| if ( | ||
| line[index].includes( | ||
| '.package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main")', | ||
| ) | ||
| ) { | ||
| if (line[index].endsWith(',')) { | ||
| textToWrite += line[index] + '\n'; | ||
| } else { | ||
| textToWrite += line[index] + ',\n'; | ||
| } | ||
|
|
||
| for (const swiftPlugin of swiftPluginList) { | ||
| const name = readSwiftPackage(swiftPlugin) ?? ''; | ||
| if (!packages.includes(name)) { | ||
| textToWrite += ' ' + swiftPlugin + '\n'; | ||
| } | ||
| } | ||
| } else { | ||
| textToWrite += line[index] + '\n'; | ||
| } | ||
| } | ||
|
|
||
| writeFileSync(packageSwiftFile, textToWrite); | ||
| } catch (err) { | ||
| logger.error( | ||
| `Unable to read ${packageSwiftFile}. Verify it is not already open. ${err}`, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export async function checkPackageManager(config: Config): Promise<string> { | ||
| const iosDirectory = config.ios.nativeProjectDirAbs; | ||
| if (existsSync(resolve(iosDirectory, 'CapApp-SPM'))) { | ||
| return 'SPM'; | ||
| } | ||
|
|
||
| return 'Cocoapods'; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-634 KB
ios/Frameworks/Capacitor.xcframework/ios-arm64/Capacitor.framework/Capacitor
Binary file not shown.
43 changes: 0 additions & 43 deletions
43
...Frameworks/Capacitor.xcframework/ios-arm64/Capacitor.framework/Headers/CAPBridgedPlugin.h
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.