Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
bbb438a1
Unverified
Commit
bbb438a1
authored
May 24, 2018
by
Samuel Giddins
Committed by
GitHub
May 24, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7769 from CocoaPods/segiddins/fix-nil-gem-version
Fix compatibility with RubyGems v2.7.7
parents
75a4f6dc
453af0a5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
CHANGELOG.md
CHANGELOG.md
+5
-1
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+2
-2
No files found.
CHANGELOG.md
View file @
bbb438a1
...
...
@@ -12,7 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### 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)
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
bbb438a1
...
...
@@ -106,7 +106,7 @@ module Pod
target
.
target_definition
.
swift_version
unless
target
.
target_definition
.
swift_version
.
blank?
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
# targets to be correctly embedded in their host.
...
...
@@ -120,7 +120,7 @@ module Pod
# cause an App Store rejection because frameworks cannot be embedded
# 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?
)
config
=
{}
if
should_embed
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment