Skip to content

Commit 082f5bf

Browse files
committed
fix(ios): ensure user defined build.xcconfig takes precedence
1 parent 8e59430 commit 082f5bf

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

lib/services/ios/xcodebuild-args-service.ts

+10
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,21 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
119119
// ref: https://forums.swift.org/t/telling-xcode-14-beta-4-to-trust-build-tool-plugins-programatically/59305/5
120120
const skipPackageValidation = "-skipPackagePluginValidation";
121121

122+
const BUILD_SETTINGS_FILE_PATH = path.join(
123+
projectData.appResourcesDirectoryPath,
124+
"iOS",
125+
constants.BUILD_XCCONFIG_FILE_NAME
126+
);
127+
122128
if (this.$fs.exists(xcworkspacePath)) {
123129
return [
124130
"-workspace",
125131
xcworkspacePath,
126132
"-scheme",
127133
projectData.projectName,
128134
skipPackageValidation,
135+
"-xcconfig",
136+
BUILD_SETTINGS_FILE_PATH,
129137
];
130138
}
131139

@@ -139,6 +147,8 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
139147
"-scheme",
140148
projectData.projectName,
141149
skipPackageValidation,
150+
"-xcconfig",
151+
BUILD_SETTINGS_FILE_PATH,
142152
];
143153
}
144154

0 commit comments

Comments
 (0)