Unverified Commit 133d8367 authored by Samuel Giddins's avatar Samuel Giddins

Merge tag '1.5.3'

Release 1.5.3

# gpg: Signature made Thu May 24 22:49:47 2018 PDT
# gpg:                using RSA key 01195BB315DDA856
# gpg: Good signature from "Samuel Giddins <segiddins@segiddins.me>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7B19 37A9 CF66 AEF6 52C9  4090 0119 5BB3 15DD A856

# Conflicts:
#	Gemfile.lock
#	lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
#	spec/cocoapods-integration-specs
#	spec/unit/installer/xcode/pods_project_generator_spec.rb
parents ce42cf9f 299c319d
......@@ -79,6 +79,20 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
* Allow `EXPANDED_CODE_SIGN_IDENTITY` to be unset.
[Keith Smiley](https://github.com/keith)
[#7708](https://github.com/CocoaPods/CocoaPods/issues/7708)
## 1.5.3 (2018-05-25)
##### Enhancements
* None.
##### Bug Fixes
* 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)
......
......@@ -7,10 +7,10 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: e7010f060f358d440dce286a23a55986ba14264e
revision: 577c69f38fdb56cbdb883b44681ca2b224cad746
branch: master
specs:
cocoapods-core (1.5.2)
cocoapods-core (1.5.3)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
......@@ -103,10 +103,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.5.2)
cocoapods (1.5.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.2)
cocoapods-core (= 1.5.3)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.1, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
......
module Pod
# The version of the CocoaPods command line tool.
#
VERSION = '1.5.2'.freeze unless defined? Pod::VERSION
VERSION = '1.5.3'.freeze unless defined? Pod::VERSION
end
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