Handle major.minor for SPM#1546
Merged
yonaskolb merged 10 commits intoyonaskolb:masterfrom Jul 22, 2025
RomanPodymov:master
Merged
Handle major.minor for SPM#1546yonaskolb merged 10 commits intoyonaskolb:masterfrom RomanPodymov:master
yonaskolb merged 10 commits intoyonaskolb:masterfrom
RomanPodymov:master
Conversation
yonaskolb
reviewed
Jul 17, 2025
Sources/ProjectSpec/Project.swift
Outdated
| include = jsonDictionary.json(atKeyPath: "include") ?? [] | ||
| if jsonDictionary["packages"] != nil { | ||
| packages = try jsonDictionary.json(atKeyPath: "packages", invalidItemBehaviour: .fail) | ||
| packages = try jsonDictionary.json(atKeyPath: "packages", invalidItemBehaviour: .custom({ error in |
Owner
There was a problem hiding this comment.
Unless I'm missing something, the fix could live directly in SwiftPackage.VersionRequirement(jsonDictionary: JSONDictionary)
Contributor
Author
There was a problem hiding this comment.
Hello @yonaskolb
It's possible since I'm not very familiar with the project)
Owner
|
This isn't strictly a bug in XcodeGen but rather in how YAML handles number literals. Doesn't mean it's not worth supporting numbers as well though |
* Update CI equipments and drop Xcode 15 support (#1548) * Add validation to ensure that settings.configs values are dictionaries, in order to prevent misuse (#1547) * Add validation to ensure settings.configs values are dictionaries to prevent misuse * Add tests for invalid settings.configs value formats * Replaced with filter and split into a function * Rename invalidConfigsFormat to invalidConfigsMappingFormat * Add comments to explain invalid fixture * Rename test fixture * Update CHANGELOG.md * Correct grammer * Use KeyPath instead of closure * Rename validateMappingStyleInConfig to extractValidConfigs * Add a document comment for extractValidConfigs(from:) * Use old testing api and remove EquatableErrorBox * Rename test case to use "mapping" instead of "dictionary" * Add ValidSettingsExtractor to encapsulate the logic for converting a dictionary to Settings * Add settings validation for both Target and AggregateTarget * Add tests for invalid settings.configs in Target and AggregateTarget * Add document comments for ValidSettingsExtractor * Rename ValidSettingsExtractor to BuildSettingsExtractor * Add settings validation for settingGroups * Add tests for settingGroups * Rename extract to parse * Refactor * Update Tests/ProjectSpecTests/InvalidConfigsFormatTests.swift --------- Co-authored-by: Yonas Kolb <[email protected]> * Synced folders (#1541) * update xcodeproj to 8.27.7 * add syncedFolder source type * drop xcode 15 support * Rely on fileReference instead of adding new synchronizedRootGroup (#1557) * fix: don't include untracked children in cache --------- Co-authored-by: Kirill Yakimovich <[email protected]> * Use USER env var instead of LOGNAME (#1559) During user switch with su/sudo in system LOGNAME may not be initialised, but USER env var is always exist. * Address Sanitizer options in run/test schemes (#1550) * Expose address sanitizer flags in run and test BuildActions in Schemes * Update testJSONEncodable to test the new fields * Also test the asan setting values for run scheme * Update changelog --------- Co-authored-by: Yonas Kolb <[email protected]> * Update to 2.44.0 # Conflicts: # CHANGELOG.md --------- Co-authored-by: Kohki Miki <[email protected]> Co-authored-by: Ryu <[email protected]> Co-authored-by: Yonas Kolb <[email protected]> Co-authored-by: Kirill Yakimovich <[email protected]> Co-authored-by: Kanstantsin Shautsou <[email protected]> Co-authored-by: Himanshu Kumar <[email protected]>
Update master again
Contributor
Author
Hello @yonaskolb |
yonaskolb
approved these changes
Jul 22, 2025
Owner
yonaskolb
left a comment
yonaskolb
left a comment
There was a problem hiding this comment.
Thank you, much better. I'll move the changelog entry location in master 👍
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hello.
Thank you for XcodeGen.
Fixed #1545
To fix it, I added custom
invalidItemBehaviourfor SPM packages decoder. Now if package version was detected as 6.0 (number), theninvalidItemBehaviourconverts it to "6.0" (string).