Skip to content

Prevent setting presets from overwriting settings in target xcconfig files #924

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

Open
k-thorat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent setting presets from overwriting settings in target xcconfig files #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19fbac7
Prevent setting presets from overwriting settings in target xcconfig …
k-thorat Aug 5, 2020
47e971f
Merge branch 'master' into fix-build-settings-merge
yonaskolb Apr 8, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Fixed framework search paths when using `.xcframework`s. [#1015](https://github.com/yonaskolb/XcodeGen/pull/1015) @FranzBusch
- Fixed bug where schemes without a build target would crash instead of displaying an error [#1040](https://github.com/yonaskolb/XcodeGen/pull/1040) @dalemyers
- Fixed files with names ending in **Info.plist** (such as **GoogleServices-Info.plist**) from being omitted from the Copy Resources build phase. Now, only the resolved info plist file for each specific target is omitted. [#1027](https://github.com/yonaskolb/XcodeGen/pull/1027) @liamnichols
- Prevent setting presets from overwriting settings in target xcconfig files. [#924](https://github.com/yonaskolb/XcodeGen/pull/924) @k-thorat

#### Internal
- Build universal binaries for release. XcodeGen now runs natively on Apple Silicon. [#1024](https://github.com/yonaskolb/XcodeGen/pull/1024) @thii
Expand Down
4 changes: 2 additions & 2 deletions Sources/XcodeGenKit/SettingsBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ extension Project {
buildSettings[target.platform.deploymentTargetSetting] = version.deploymentTarget
}

buildSettings += getBuildSettings(settings: target.settings, config: config)

// Prevent setting presets from overrwriting settings in target xcconfig files
if let configPath = target.configFiles[config.name] {
buildSettings = removeConfigFileSettings(from: buildSettings, configPath: configPath)
Expand All @@ -64,8 +66,6 @@ extension Project {
buildSettings = removeConfigFileSettings(from: buildSettings, configPath: configPath)
}

buildSettings += getBuildSettings(settings: target.settings, config: config)

return buildSettings
}

Expand Down
5 changes: 5 additions & 0 deletions Tests/Fixtures/settings_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,15 @@ targets:
Target:
type: application
platform: iOS
configFiles:
# To verify build setting merge we need to duplicate setting in configFiles and settings
# BASE_SETTING: baseSetting is defined in base.xcconfig and for this target under settings:base:
config1: TestProject/Configs/base.xcconfig
settings:
groups:
- preset7
base:
BASE_SETTING: baseSetting
SETTING 2: value 2
configs:
config1:
Expand Down