Skip to content

Commit

Permalink
Merge pull request #9813 from CocoaPods/merge_192_into_master
Browse files Browse the repository at this point in the history
Merge `1-9-stable` (1.9.2) into `master`
  • Loading branch information
dnkoutso committed May 22, 2020
2 parents bb0820e + 0864a3d commit 7673c15
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 18 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[jerbob92](https://github.com/jerbob92)
[#9790](https://github.com/CocoaPods/CocoaPods/pull/9790)

## 1.9.2 (2020-05-22)

##### Enhancements

* None.

##### Bug Fixes

* None.


## 1.9.1 (2020-03-09)

##### Enhancements
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ group :development do

gem 'cocoapods-dependencies', '~> 1.0.beta.1'

gem 'activesupport', '>= 4.0.2', '< 5', '!= 4.2.11.12' # Pinned < 5 to ensure we're speccing 4.x.x
gem 'bacon', :git => 'https://github.com/leahneukirchen/bacon.git'
gem 'minitest', '5.12.0' # Pinned since > 5.12.0+ drops support for Ruby 2.0
gem 'mocha'
Expand Down
35 changes: 18 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ GIT

GIT
remote: https://github.com/CocoaPods/Core.git
revision: 24caf8e1103aded6cab8332007921f92c67e426f
revision: 2788188d8a2b820ca54b2989827eec4bb5fe07cf
branch: master
specs:
cocoapods-core (1.9.1)
cocoapods-core (1.9.2)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
Expand All @@ -21,24 +21,24 @@ GIT

GIT
remote: https://github.com/CocoaPods/Molinillo.git
revision: b419616b2230663db01462a4b93c01d3c3569a8d
revision: e1a548a8bd5232027ef008383bdad9107c18a4dd
branch: master
specs:
molinillo (0.6.6)

GIT
remote: https://github.com/CocoaPods/Nanaimo.git
revision: 9b30f911a506b9b42d15ea8808d3236a8971010e
revision: 1414d9c0b642e376873138325f8132e8f053988a
branch: master
specs:
nanaimo (0.2.6)

GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: b9375049007fca925ef16ea9487681bcaa59a5ad
revision: 1112f447897c116cac1a107de1ffbcb177c702f4
branch: master
specs:
xcodeproj (1.15.0)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -61,7 +61,7 @@ GIT

GIT
remote: https://github.com/CocoaPods/cocoapods-plugins.git
revision: a4549f05cda07771e4ebc29b79db553eeaaf6afd
revision: 683b4fbef37740301543f3a7bd46b88c2ff305f5
branch: master
specs:
cocoapods-plugins (1.0.0)
Expand All @@ -76,19 +76,19 @@ GIT

GIT
remote: https://github.com/CocoaPods/cocoapods-trunk.git
revision: 67959306c053bc77c73388865a5ac4de22574d96
revision: 00eca277d17d24c272adb6c7fa8d7c2c3fe8da3b
branch: master
specs:
cocoapods-trunk (1.4.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)

GIT
remote: https://github.com/CocoaPods/cocoapods-try.git
revision: 2c0840a6ba64056931622abc1d11479ffcc4a31b
revision: 607f9c85b4aea8a5662b68ab41cdd402f94d84c3
branch: master
specs:
cocoapods-try (1.1.0)
cocoapods-try (1.2.0)

GIT
remote: https://github.com/leahneukirchen/bacon.git
Expand All @@ -106,10 +106,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.9.1)
cocoapods (1.9.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.1)
cocoapods-core (= 1.9.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -129,14 +129,14 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
algoliasearch (1.27.1)
algoliasearch (1.27.2)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
ast (2.4.0)
Expand Down Expand Up @@ -259,9 +259,9 @@ GEM
terminal-table (1.6.0)
thread_safe (0.3.6)
tins (1.16.3)
typhoeus (1.3.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
webmock (2.3.1)
Expand All @@ -274,6 +274,7 @@ PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 4.0.2, < 5, != 4.2.11.12)
awesome_print
bacon!
bundler (~> 1.3)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/gem_version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Pod
# The version of the CocoaPods command line tool.
#
VERSION = '1.9.1'.freeze unless defined? Pod::VERSION
VERSION = '1.9.2'.freeze unless defined? Pod::VERSION
end

0 comments on commit 7673c15

Please sign in to comment.