Skip to content

Commit 47ae1be

Browse files
committed
Merge branch 'main' into add-swifttesting-parallelizable-handling
2 parents 6118f73 + 9f26d78 commit 47ae1be

File tree

4 files changed

+33
-17
lines changed

4 files changed

+33
-17
lines changed

.mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tools]
22
swiftformat = "0.54.3"
3-
tuist = "4.31.0"
3+
tuist = "4.36.0"
44
swiftlint = "0.55.1"
55
"git-cliff" = "2.4.0"

CHANGELOG.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [8.24.11] - 2024-11-27
9+
### Details
10+
#### Chore
11+
- Update dependency tuist to v4.36.0 by @renovate[bot] in [#882](https://github.com/tuist/XcodeProj/pull/882)
12+
13+
## [8.24.10] - 2024-11-20
14+
### Details
15+
#### Refactor
16+
- Align ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES with the Xcode default by @yungu0010 in [#881](https://github.com/tuist/XcodeProj/pull/881)
17+
18+
## New Contributors
19+
* @yungu0010 made their first contribution in [#881](https://github.com/tuist/XcodeProj/pull/881)
20+
## [8.24.9] - 2024-11-07
21+
### Details
22+
#### Chore
23+
- Update dependency tuist to v4.33.0 by @renovate[bot] in [#877](https://github.com/tuist/XcodeProj/pull/877)
24+
25+
## [8.24.8] - 2024-11-01
26+
### Details
27+
#### Chore
28+
- Update dependency tuist to v4.32.1 by @renovate[bot] in [#876](https://github.com/tuist/XcodeProj/pull/876)
29+
30+
## [8.24.7] - 2024-10-31
31+
### Details
32+
#### Chore
33+
- Update dependency tuist to v4.32.0 by @renovate[bot] in [#875](https://github.com/tuist/XcodeProj/pull/875)
34+
835
## [8.24.6] - 2024-10-23
936
### Details
1037
#### Chore
@@ -115,6 +142,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
115142
#### Feat
116143
- Introduce the new Xcode 16 models `PBXFileSystemSynchronizedRootGroup` and `PBXFileSystemSynchronizedBuildFileExceptionSet` by @pepicrft in [#827](https://github.com/tuist/XcodeProj/pull/827)
117144

145+
[8.24.11]: https://github.com/tuist/XcodeProj/compare/8.24.10..8.24.11
146+
[8.24.10]: https://github.com/tuist/XcodeProj/compare/8.24.9..8.24.10
147+
[8.24.9]: https://github.com/tuist/XcodeProj/compare/8.24.8..8.24.9
148+
[8.24.8]: https://github.com/tuist/XcodeProj/compare/8.24.7..8.24.8
149+
[8.24.7]: https://github.com/tuist/XcodeProj/compare/8.24.6..8.24.7
118150
[8.24.6]: https://github.com/tuist/XcodeProj/compare/8.24.5..8.24.6
119151
[8.24.5]: https://github.com/tuist/XcodeProj/compare/8.24.4..8.24.5
120152
[8.24.4]: https://github.com/tuist/XcodeProj/compare/8.24.3..8.24.4

Sources/XcodeProj/Utils/BuildSettingsProvider.swift

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ public class BuildSettingsProvider {
7272
buildSettings.merge(targetSwiftSettings(product: product), uniquingKeysWith: { $1 })
7373
}
7474

75-
if let platform, let product, let swift, swift == true {
76-
buildSettings.merge(targetSwiftSettings(platform: platform, product: product), uniquingKeysWith: { $1 })
77-
}
78-
7975
return buildSettings
8076
}
8177

@@ -370,17 +366,6 @@ public class BuildSettingsProvider {
370366
return [:]
371367
}
372368
}
373-
374-
private static func targetSwiftSettings(platform: Platform, product: Product) -> BuildSettings {
375-
switch (platform, product) {
376-
case (.watchOS, .application):
377-
return [
378-
"ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
379-
]
380-
default:
381-
return [:]
382-
}
383-
}
384369
}
385370

386371
// Overloading `~=` enables customizing switch statement pattern matching

Tests/XcodeProjTests/Utils/BuildSettingsProviderTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ class BuildSettingProviderTests: XCTestCase {
135135

136136
// Then
137137
assertEqualSettings(results, [
138-
"ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
139138
"ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
140139
"ENABLE_PREVIEWS": "YES",
141140
"LD_RUNPATH_SEARCH_PATHS": ["$(inherited)", "@executable_path/Frameworks"],

0 commit comments

Comments
 (0)