Skip to content

Commit

Permalink
Merge pull request #825 from dnkoutso/xcode13_object_version
Browse files Browse the repository at this point in the history
Add Xcode 13.0 object version support.
  • Loading branch information
dnkoutso committed Jul 2, 2021
2 parents 7efa821 + c96918b commit d452ec3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

##### Enhancements

* Add Xcode 13.0 object version support.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#825](https://github.com/CocoaPods/Xcodeproj/pull/825)

* Add support to parse OTHER_LDFLAGS arg files using '@'
[dnkoutso](https://github.com/dnkoutso)
[#820](https://github.com/CocoaPods/Xcodeproj/pull/820)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ GEM
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
ffi (1.9.17)
ffi (1.15.3)
git (1.3.0)
kicker (3.0.0)
listen (~> 1.3.0)
Expand Down
3 changes: 2 additions & 1 deletion lib/xcodeproj/constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module Constants

# @return [String] The last known object version to Xcodeproj.
#
LAST_KNOWN_OBJECT_VERSION = 54
LAST_KNOWN_OBJECT_VERSION = 55

# @return [String] The last known Xcode version to Xcodeproj.
#
Expand Down Expand Up @@ -128,6 +128,7 @@ module Constants
# @return [Hash] The compatibility version string for different object versions.
#
COMPATIBILITY_VERSION_BY_OBJECT_VERSION = {
55 => 'Xcode 13.0',
54 => 'Xcode 12.0',
53 => 'Xcode 11.4',
52 => 'Xcode 11.0',
Expand Down
4 changes: 2 additions & 2 deletions lib/xcodeproj/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ def initialize_from_file
end

if archive_version.to_i > Constants::LAST_KNOWN_ARCHIVE_VERSION
raise '[Xcodeproj] Unknown archive version.'
raise "[Xcodeproj] Unknown archive version (#{archive_version.to_i})."
end

if object_version.to_i > Constants::LAST_KNOWN_OBJECT_VERSION
raise '[Xcodeproj] Unknown object version.'
raise "[Xcodeproj] Unknown object version (#{object_version.to_i})."
end

# Projects can have product_ref_groups that are not listed in the main_groups["Products"]
Expand Down

0 comments on commit d452ec3

Please sign in to comment.