Commit c6e557b0 authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #5602 from CocoaPods/avoid-activesupport-5

Avoid use of `activesupport` version 5
parents a3af2554 4c0130e7
...@@ -51,6 +51,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -51,6 +51,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz) [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
[#5052](https://github.com/CocoaPods/CocoaPods/issues/5052) [#5052](https://github.com/CocoaPods/CocoaPods/issues/5052)
* Avoid use of `activesupport` version 5 to stay compatible with macOS system Ruby.
[Boris Bügling](https://github.com/neonichu)
[#5602](https://github.com/CocoaPods/CocoaPods/issues/5602)
* Fix installing pods with `use_frameworks` when deduplication is disabled. * Fix installing pods with `use_frameworks` when deduplication is disabled.
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
[#5481](https://github.com/CocoaPods/CocoaPods/issues/5481) [#5481](https://github.com/CocoaPods/CocoaPods/issues/5481)
......
...@@ -95,7 +95,7 @@ PATH ...@@ -95,7 +95,7 @@ PATH
remote: . remote: .
specs: specs:
cocoapods (1.0.1) cocoapods (1.0.1)
activesupport (>= 4.0.2) activesupport (>= 4.0.2, < 5)
claide (>= 1.0.0, < 2.0) claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.0.1) cocoapods-core (= 1.0.1)
cocoapods-deintegrate (>= 1.0.0, < 2.0) cocoapods-deintegrate (>= 1.0.0, < 2.0)
......
...@@ -40,7 +40,8 @@ Gem::Specification.new do |s| ...@@ -40,7 +40,8 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'molinillo', '~> 0.5.0' s.add_runtime_dependency 'molinillo', '~> 0.5.0'
s.add_runtime_dependency 'xcodeproj', '>= 1.1.0', '< 2.0' s.add_runtime_dependency 'xcodeproj', '>= 1.1.0', '< 2.0'
s.add_runtime_dependency 'activesupport', '>= 4.0.2' ## Version 5 needs Ruby 2.2, so we specify an upper bound to stay compatible with system ruby
s.add_runtime_dependency 'activesupport', '>= 4.0.2', '< 5'
s.add_runtime_dependency 'colored', '~> 1.2' s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4' s.add_runtime_dependency 'escape', '~> 0.0.4'
s.add_runtime_dependency 'fourflusher', '~> 1.0.1' s.add_runtime_dependency 'fourflusher', '~> 1.0.1'
......
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