Commit 08302a93 authored by Samuel Giddins's avatar Samuel Giddins

[Gemspec] Bump Molinillo to `~> 0.4.4`

parent 9a3a78e9
...@@ -17,10 +17,10 @@ GIT ...@@ -17,10 +17,10 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Molinillo.git remote: https://github.com/CocoaPods/Molinillo.git
revision: 163738c406f5cfc1bb7fbc9487b5ae45b8e82ae4 revision: 75a5c1272a68ea76581535a9441d8be64b7dd362
branch: master branch: master
specs: specs:
molinillo (0.4.3) molinillo (0.4.4)
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
...@@ -108,7 +108,7 @@ PATH ...@@ -108,7 +108,7 @@ PATH
colored (~> 1.2) colored (~> 1.2)
escape (~> 0.0.4) escape (~> 0.0.4)
fourflusher (~> 0.3.0) fourflusher (~> 0.3.0)
molinillo (~> 0.4.3) molinillo (~> 0.4.4)
nap (~> 1.0) nap (~> 1.0)
xcodeproj (>= 1.0.0.beta.3, < 2.0) xcodeproj (>= 1.0.0.beta.3, < 2.0)
......
...@@ -37,7 +37,7 @@ Gem::Specification.new do |s| ...@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'cocoapods-stats', '>= 1.0.0.beta.3', '< 2.0' s.add_runtime_dependency 'cocoapods-stats', '>= 1.0.0.beta.3', '< 2.0'
s.add_runtime_dependency 'cocoapods-trunk', '>= 1.0.0.beta.2', '< 2.0' s.add_runtime_dependency 'cocoapods-trunk', '>= 1.0.0.beta.2', '< 2.0'
s.add_runtime_dependency 'cocoapods-try', '>= 1.0.0.beta.2', '< 2.0' s.add_runtime_dependency 'cocoapods-try', '>= 1.0.0.beta.2', '< 2.0'
s.add_runtime_dependency 'molinillo', '~> 0.4.3' s.add_runtime_dependency 'molinillo', '~> 0.4.4'
s.add_runtime_dependency 'xcodeproj', '>= 1.0.0.beta.3', '< 2.0' s.add_runtime_dependency 'xcodeproj', '>= 1.0.0.beta.3', '< 2.0'
s.add_runtime_dependency 'activesupport', '>= 4.0.2' s.add_runtime_dependency 'activesupport', '>= 4.0.2'
......
...@@ -367,7 +367,7 @@ module Pod ...@@ -367,7 +367,7 @@ module Pod
# @param [Molinillo::ResolverError] error # @param [Molinillo::ResolverError] error
# #
def handle_resolver_error(error) def handle_resolver_error(error)
message = error.message message = error.message.dup
case error case error
when Molinillo::VersionConflict when Molinillo::VersionConflict
error.conflicts.each do |name, conflict| error.conflicts.each do |name, conflict|
......
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