Skip to content

Commit

Permalink
[Gemfile] Use 2.2+ compatible JSON fork
Browse files Browse the repository at this point in the history
  • Loading branch information
segiddins committed Jul 11, 2016
1 parent fe71b7d commit db81e7e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ gemspec
gem 'claide', :git => 'https://github.com/CocoaPods/CLAide'

# This is the version that ships with OS X 10.10, so be sure we test against it.
gem 'json', '1.7.7'
# At the same time, the 1.7.7 version won't install cleanly on Ruby > 2.2,
# so we use a fork that makes a trivial change to a macro invocation.
gem 'json', :git => 'https://github.com/segiddins/json.git', :branch => 'seg-1.7.7-ruby-2.2'

group :development do
gem 'mocha'
Expand Down
10 changes: 8 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ GIT
specs:
claide (1.0.0)

GIT
remote: https://github.com/segiddins/json.git
revision: a9588bc4334c2f5bf985f255b61c05eafdcd8907
branch: seg-1.7.7-ruby-2.2
specs:
json (1.7.7)

PATH
remote: .
specs:
Expand All @@ -29,7 +36,6 @@ GEM
docile (1.1.5)
ffi (1.9.6)
i18n (0.7.0)
json (1.7.7)
kicker (3.0.0)
listen (~> 1.3.0)
notify (~> 0.5.2)
Expand Down Expand Up @@ -81,7 +87,7 @@ DEPENDENCIES
bacon
claide!
codeclimate-test-reporter
json (= 1.7.7)
json!
kicker
mocha
mocha-on-bacon
Expand Down

0 comments on commit db81e7e

Please sign in to comment.