Skip to content

Commit

Permalink
Merge pull request #9812 from CocoaPods/pin_activesupport
Browse files Browse the repository at this point in the history
Pin activesupport version due to error with 4.2.11.12
  • Loading branch information
dnkoutso committed May 22, 2020
2 parents 485882b + 40b99c8 commit d49c3f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -39,6 +39,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
5 changes: 3 additions & 2 deletions Gemfile.lock
Expand Up @@ -137,7 +137,7 @@ 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)
Expand Down Expand Up @@ -269,7 +269,7 @@ GEM
tins (1.16.3)
typhoeus (1.3.1)
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 @@ -282,6 +282,7 @@ PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 4.0.2, < 5, != 4.2.11.12)
awesome_print
bacon!
bundler (~> 1.3)
Expand Down

0 comments on commit d49c3f4

Please sign in to comment.