Unverified Commit bbb438a1 authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #7769 from CocoaPods/segiddins/fix-nil-gem-version

Fix compatibility with RubyGems v2.7.7
parents 75a4f6dc 453af0a5
...@@ -12,7 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -12,7 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* None. * Fix compatibility with RubyGems 2.7.7.
[Samuel Giddins](https://github.com/segiddins)
[#7765](https://github.com/CocoaPods/CocoaPods/issues/7765)
[#7766](https://github.com/CocoaPods/CocoaPods/issues/7766)
[#7763](https://github.com/CocoaPods/CocoaPods/issues/7763)
## 1.5.2 (2018-05-09) ## 1.5.2 (2018-05-09)
......
...@@ -106,7 +106,7 @@ module Pod ...@@ -106,7 +106,7 @@ module Pod
target.target_definition.swift_version unless target.target_definition.swift_version.blank? target.target_definition.swift_version unless target.target_definition.swift_version.blank?
end end
EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION = Gem::Version.new('2.3') EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION = Version.new('2.3')
# @return [Hash<String, String>] the build settings necessary for Swift # @return [Hash<String, String>] the build settings necessary for Swift
# targets to be correctly embedded in their host. # targets to be correctly embedded in their host.
...@@ -120,7 +120,7 @@ module Pod ...@@ -120,7 +120,7 @@ module Pod
# cause an App Store rejection because frameworks cannot be embedded # cause an App Store rejection because frameworks cannot be embedded
# in embedded targets. # in embedded targets.
swift_version = Gem::Version.new(target_swift_version) swift_version = Version.new(target_swift_version)
should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?) should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?)
config = {} config = {}
if should_embed if should_embed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment