Commit 11ecc3a5 authored by Eloy Duran's avatar Eloy Duran

Use last version of faraday that doesn't complain about `system_timer` gem missing.

parent 356216d5
...@@ -4,7 +4,14 @@ gem "colored" ...@@ -4,7 +4,14 @@ gem "colored"
gem "escape" gem "escape"
gem "json" gem "json"
gem "open4" gem "open4"
gem "octokit"
# We don't want octokit to pull in faraday 0.8.0, as it prints a warning about
# the `system_timer` gem being needed, which isn't available on 1.9.x
#
# Once faraday 0.8.1 is released this should be resolved:
# https://github.com/technoweenie/faraday/pull/147
gem "faraday", "0.7.6"
gem "octokit", "<= 1.0.3"
group :development do group :development do
gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git" gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git"
......
...@@ -14,8 +14,10 @@ GEM ...@@ -14,8 +14,10 @@ GEM
colored (1.2) colored (1.2)
crack (0.3.1) crack (0.3.1)
escape (0.0.4) escape (0.0.4)
faraday (0.8.0) faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1) multipart-post (~> 1.1)
rack (~> 1.1)
faraday_middleware (0.8.7) faraday_middleware (0.8.7)
faraday (>= 0.7.4, < 0.9) faraday (>= 0.7.4, < 0.9)
hashie (1.2.0) hashie (1.2.0)
...@@ -28,11 +30,11 @@ GEM ...@@ -28,11 +30,11 @@ GEM
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mocha-on-bacon (0.2.0) mocha-on-bacon (0.2.0)
mocha (>= 0.9.8) mocha (>= 0.9.8)
multi_json (1.3.5) multi_json (1.3.6)
multipart-post (1.1.5) multipart-post (1.1.5)
octokit (1.3.0) octokit (1.0.3)
addressable (~> 2.2) addressable (~> 2.2)
faraday (~> 0.8) faraday (~> 0.7)
faraday_middleware (~> 0.8) faraday_middleware (~> 0.8)
hashie (~> 1.2) hashie (~> 1.2)
multi_json (~> 1.3) multi_json (~> 1.3)
...@@ -41,6 +43,7 @@ GEM ...@@ -41,6 +43,7 @@ GEM
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.7.1) method_source (~> 0.7.1)
slop (>= 2.4.4, < 3) slop (>= 2.4.4, < 3)
rack (1.4.1)
rake (0.9.2.2) rake (0.9.2.2)
rb-fsevent (0.9.1) rb-fsevent (0.9.1)
slop (2.4.4) slop (2.4.4)
...@@ -57,10 +60,11 @@ DEPENDENCIES ...@@ -57,10 +60,11 @@ DEPENDENCIES
bacon bacon
colored colored
escape escape
faraday (= 0.7.6)
json json
kicker kicker
mocha-on-bacon mocha-on-bacon
octokit octokit (<= 1.0.3)
open4 open4
pry pry
rake rake
......
...@@ -28,10 +28,17 @@ Gem::Specification.new do |s| ...@@ -28,10 +28,17 @@ Gem::Specification.new do |s|
s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \ s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \
"you are upgrading, first run: $ pod setup" "you are upgrading, first run: $ pod setup"
# We don't want octokit to pull in faraday 0.8.0, as it prints a warning about
# the `system_timer` gem being needed, which isn't available on 1.9.x
#
# Once faraday 0.8.1 is released this should be resolved:
# https://github.com/technoweenie/faraday/pull/147
s.add_runtime_dependency 'faraday', '~> 0.7.6'
s.add_runtime_dependency 'octokit', '<= 1.0.3'
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 'json', '~> 1.7.3' s.add_runtime_dependency 'json', '~> 1.7.3'
s.add_runtime_dependency 'octokit', '~> 1.3.0'
s.add_runtime_dependency 'open4', '~> 1.3.0' s.add_runtime_dependency 'open4', '~> 1.3.0'
s.add_runtime_dependency 'rake', '~> 0.9.0' s.add_runtime_dependency 'rake', '~> 0.9.0'
s.add_runtime_dependency 'xcodeproj', '~> 0.1.0' # TODO update to RC1 for 0.6.0.rc1 s.add_runtime_dependency 'xcodeproj', '~> 0.1.0' # TODO update to RC1 for 0.6.0.rc1
......
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