diff --git a/plugin/src/withPlist.ts b/plugin/src/withPlist.ts index 206d21c..2f68b0b 100644 --- a/plugin/src/withPlist.ts +++ b/plugin/src/withPlist.ts @@ -12,9 +12,7 @@ import { getAppClipIcon } from "./lib/getAppClipIcon"; /** * List of keys that are not allowed in the Info.plist due to not being supported in App Clip. Add to this array as new build issues arise. */ -const DisallowedPlistKeys = [ - "UIBackgroundModes", -]; +const DisallowedPlistKeys = ["UIBackgroundModes"]; export const withPlist: ConfigPlugin<{ targetName: string; @@ -67,9 +65,17 @@ export const withPlist: ConfigPlugin<{ MinimumOSVersion: deploymentTarget, }; + if (config.modResults.UIApplicationSceneManifest) { + infoPlist.UIApplicationSceneManifest = + config.modResults.UIApplicationSceneManifest; + } + if (config.ios?.infoPlist) { for (const key of Object.keys(config.ios?.infoPlist)) { - if (config.ios?.infoPlist && !DisallowedPlistKeys.some((disallowedKey) => disallowedKey === key)) { + if ( + config.ios?.infoPlist && + !DisallowedPlistKeys.some((disallowedKey) => disallowedKey === key) + ) { infoPlist[key] = config.ios.infoPlist[key]; } } diff --git a/plugin/src/withXcode.ts b/plugin/src/withXcode.ts index 7ef984f..1bde10e 100644 --- a/plugin/src/withXcode.ts +++ b/plugin/src/withXcode.ts @@ -22,7 +22,10 @@ export const withXcode: ConfigPlugin<{ bundleIdentifier: string; deploymentTarget: string; enableCompression?: boolean; -}> = (config, { name, targetName, bundleIdentifier, deploymentTarget, enableCompression }) => { +}> = ( + config, + { name, targetName, bundleIdentifier, deploymentTarget, enableCompression }, +) => { return withXcodeProject(config, (config) => { const xcodeProject = config.modResults; const appClipIcon = getAppClipIcon(config); @@ -57,7 +60,7 @@ export const withXcode: ConfigPlugin<{ addTargetDependency(xcodeProject, target); - addPbxGroup(xcodeProject, { + const sourceFiles = addPbxGroup(xcodeProject, { projectName: projectName as string, targetName, platformProjectRoot, @@ -83,6 +86,7 @@ export const withXcode: ConfigPlugin<{ productFile, enableCompression, resourcesPhaseName: appClipIcon ? "Resources" : undefined, + sourceFiles, }); if (appClipIcon) { diff --git a/plugin/src/xcode/addBuildPhases.ts b/plugin/src/xcode/addBuildPhases.ts index e9038b7..65e00d6 100644 --- a/plugin/src/xcode/addBuildPhases.ts +++ b/plugin/src/xcode/addBuildPhases.ts @@ -9,6 +9,7 @@ export function addBuildPhases( productFile, enableCompression, resourcesPhaseName, + sourceFiles, }: { targetUuid: string; groupName: string; @@ -20,13 +21,12 @@ export function addBuildPhases( }; enableCompression?: boolean; resourcesPhaseName?: string; + sourceFiles: string[]; }, ) { const buildPath = `"$(CONTENTS_FOLDER_PATH)/AppClips"`; const folderType = "watch2_app"; // "watch2_app" uses the same subfolder spec (16), app_clip does not exist in cordova-node-xcode yet - const buildPhaseFiles = ["AppDelegate.swift"]; - // Add shell script build phase "Start Packager" xcodeProject.addBuildPhase( [], @@ -43,7 +43,7 @@ export function addBuildPhases( // Sources build phase xcodeProject.addBuildPhase( - buildPhaseFiles, + sourceFiles, "PBXSourcesBuildPhase", groupName, targetUuid, diff --git a/plugin/src/xcode/addPbxGroup.ts b/plugin/src/xcode/addPbxGroup.ts index b83ee2d..d118d68 100644 --- a/plugin/src/xcode/addPbxGroup.ts +++ b/plugin/src/xcode/addPbxGroup.ts @@ -22,10 +22,16 @@ export function addPbxGroup( fs.mkdirSync(targetPath, { recursive: true }); } - const filesToCopy = [ - "SplashScreen.storyboard", - "AppDelegate.swift", - ]; + const sourceFiles = ["AppDelegate.swift"]; + if ( + fs.existsSync( + path.join(platformProjectRoot, projectName, "SceneDelegate.swift"), + ) + ) { + sourceFiles.push("SceneDelegate.swift"); + } + + const filesToCopy = ["SplashScreen.storyboard", ...sourceFiles]; for (const file of filesToCopy) { const source = path.join(platformProjectRoot, projectName, file); @@ -51,7 +57,7 @@ export function addPbxGroup( // Add PBX group const { uuid: pbxGroupUuid } = xcodeProject.addPbxGroup( [ - "AppDelegate.swift", + ...sourceFiles, "Info.plist", "Images.xcassets", "SplashScreen.storyboard", @@ -72,6 +78,8 @@ export function addPbxGroup( } } } + + return sourceFiles; } function copyFileSync(source: string, target: string) {