Commit 7b809ac3 authored by Eloy Durán's avatar Eloy Durán

[bundle] Explicitely test against json version that comes with OS X.

parent b75e65cb
...@@ -10,6 +10,9 @@ source 'http://rubygems.org' ...@@ -10,6 +10,9 @@ source 'http://rubygems.org'
gemspec gemspec
# This is the version that ships with OS X 10.10, so be sure we test against it.
gem 'json', '1.7.7'
group :development do group :development do
cp_gem 'claide', 'CLAide' cp_gem 'claide', 'CLAide'
cp_gem 'cocoapods-core', 'Core' cp_gem 'cocoapods-core', 'Core'
......
...@@ -7,7 +7,7 @@ GIT ...@@ -7,7 +7,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Core.git remote: https://github.com/CocoaPods/Core.git
revision: 4eb2c2ea287e517e633d75bfd29b829e1a6097ae revision: 8b554d8dd184e75bb79dcc86a7056e9fef35e952
branch: master branch: master
specs: specs:
cocoapods-core (0.34.4) cocoapods-core (0.34.4)
...@@ -17,14 +17,14 @@ GIT ...@@ -17,14 +17,14 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Molinillo.git remote: https://github.com/CocoaPods/Molinillo.git
revision: e86cec392a75c577f2c803d8cc87debe41a9bdbe revision: 67d09200c8baca9547f54a0145b405c658e0ba07
branch: master branch: master
specs: specs:
molinillo (0.1.0) molinillo (0.1.0)
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 7341b637687c648c9f9479a3881af47a19ff5fc7 revision: a37c7013fec57681594caefc717e5d03cbc06cb2
branch: master branch: master
specs: specs:
xcodeproj (0.20.1) xcodeproj (0.20.1)
...@@ -48,11 +48,10 @@ GIT ...@@ -48,11 +48,10 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/cocoapods-trunk.git remote: https://github.com/CocoaPods/cocoapods-trunk.git
revision: 418085ebd393426cc6ab16e646ae0663921dbe81 revision: f816ed0f9b35fe64ab0514bee2e0a2a58d167595
branch: master branch: master
specs: specs:
cocoapods-trunk (0.3.1) cocoapods-trunk (0.3.1)
json_pure (~> 1.8)
nap (>= 0.8) nap (>= 0.8)
netrc (= 0.7.8) netrc (= 0.7.8)
...@@ -108,8 +107,7 @@ GEM ...@@ -108,8 +107,7 @@ GEM
ffi (1.9.6) ffi (1.9.6)
fuzzy_match (2.0.4) fuzzy_match (2.0.4)
i18n (0.6.11) i18n (0.6.11)
json (1.8.1) json (1.7.7)
json_pure (1.8.1)
kicker (3.0.0) kicker (3.0.0)
listen (~> 1.3.0) listen (~> 1.3.0)
notify (~> 0.5.2) notify (~> 0.5.2)
...@@ -128,7 +126,7 @@ GEM ...@@ -128,7 +126,7 @@ GEM
netrc (0.7.8) netrc (0.7.8)
notify (0.5.2) notify (0.5.2)
open4 (1.3.4) open4 (1.3.4)
parser (2.2.0.pre.5) parser (2.2.0.pre.6)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5) slop (~> 3.4, >= 3.4.5)
powerpack (0.0.9) powerpack (0.0.9)
...@@ -178,6 +176,7 @@ DEPENDENCIES ...@@ -178,6 +176,7 @@ DEPENDENCIES
cocoapods-trunk! cocoapods-trunk!
cocoapods-try! cocoapods-try!
diffy diffy
json (= 1.7.7)
kicker kicker
mocha mocha
mocha-on-bacon mocha-on-bacon
......
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