Skip to content

feat(ios): ensure user defined xcconfig always takes priority #5784

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
merged 3 commits into from
Feb 1, 2024
Merged

feat(ios): ensure user defined xcconfig always takes priority #5784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5486ea5
fix(ios): ensure user defined build.xcconfig takes precedence
NathanWalker Jan 29, 2024
5aa603a
chore: note
NathanWalker Jan 29, 2024
ba5edbe
chore: cleanup
NathanWalker Feb 1, 2024
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
2 changes: 1 addition & 1 deletion lib/definitions/ios.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ declare global {
buildConfig: IBuildConfig
): Promise<string[]>;
getXcodeProjectArgs(
projectRoot: string,
platformData: IPlatformData,
projectData: IProjectData
): string[];
}
Expand Down
2 changes: 1 addition & 1 deletion lib/services/ios/spm-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class SPMService implements ISPMService {
) {
await this.$xcodebuildCommandService.executeCommand(
this.$xcodebuildArgsService
.getXcodeProjectArgs(platformData.projectRoot, projectData)
.getXcodeProjectArgs(platformData, projectData)
.concat([
"-destination",
"generic/platform=iOS",
Expand Down
43 changes: 24 additions & 19 deletions lib/services/ios/xcodebuild-args-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
)
)
.concat(this.getBuildLoggingArgs())
.concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData));
.concat(this.getXcodeProjectArgs(platformData, projectData));

return args;
}
Expand All @@ -78,7 +78,7 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
buildConfig.release ? Configurations.Release : Configurations.Debug,
"-allowProvisioningUpdates",
]
.concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData))
.concat(this.getXcodeProjectArgs(platformData, projectData))
.concat(architectures)
.concat(
this.getBuildCommonArgs(
Expand Down Expand Up @@ -108,38 +108,43 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
}

public getXcodeProjectArgs(
projectRoot: string,
platformData: IPlatformData,
projectData: IProjectData
): string[] {
const xcworkspacePath = path.join(
projectRoot,
platformData.projectRoot,
`${projectData.projectName}.xcworkspace`
);
// Introduced in Xcode 14+
// ref: https://forums.swift.org/t/telling-xcode-14-beta-4-to-trust-build-tool-plugins-programatically/59305/5
const skipPackageValidation = "-skipPackagePluginValidation";

const extraArgs: string[] = [
"-scheme",
projectData.projectName,
skipPackageValidation,
];

const BUILD_SETTINGS_FILE_PATH = path.join(
projectData.appResourcesDirectoryPath,
platformData.normalizedPlatformName,
constants.BUILD_XCCONFIG_FILE_NAME
);

if (this.$fs.exists(BUILD_SETTINGS_FILE_PATH)) {
extraArgs.push("-xcconfig");
extraArgs.push(BUILD_SETTINGS_FILE_PATH);
}

if (this.$fs.exists(xcworkspacePath)) {
return [
"-workspace",
xcworkspacePath,
"-scheme",
projectData.projectName,
skipPackageValidation,
];
return ["-workspace", xcworkspacePath, ...extraArgs];
}

const xcodeprojPath = path.join(
projectRoot,
platformData.projectRoot,
`${projectData.projectName}.xcodeproj`
);
return [
"-project",
xcodeprojPath,
"-scheme",
projectData.projectName,
skipPackageValidation,
];
return ["-project", xcodeprojPath, ...extraArgs];
}

private getBuildLoggingArgs(): string[] {
Expand Down