Skip to content

Commit

Permalink
Allow activesupport 5
Browse files Browse the repository at this point in the history
  • Loading branch information
greysteil committed Jun 3, 2017
1 parent f0d5f24 commit a3ac1d6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ script: bundle exec rake spec
git:
submodules: false
before_install:
- gem install bundler
- |
master_sha="$(ruby -e "puts '`git submodule status spec/fixtures/spec-repos/master`'.strip.sub(/^-/, '').split(/\s/, 2).first")"
curl -ssL "https://github.com/CocoaPods/Specs/archive/$master_sha.tar.gz" | tar xz -C spec/fixtures/spec-repos
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ gemspec
gem 'json', :git => 'https://github.com/segiddins/json.git', :branch => 'seg-1.7.7-ruby-2.2'

group :development do
gem 'activesupport', '>= 4.0.2', '< 5' # Pinned < 5 to ensure we're speccing 4.x.x
gem 'bacon'
gem 'mocha'
gem 'mocha-on-bacon'
Expand All @@ -16,8 +17,8 @@ group :development do
gem 'vcr'
gem 'webmock'

gem 'codeclimate-test-reporter', :require => nil
gem 'rubocop'
gem 'codeclimate-test-reporter', '~> 0.4.1', :require => nil
gem 'rubocop', '~> 0.38.0'
end

group :debugging do
Expand Down
11 changes: 6 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PATH
remote: .
specs:
cocoapods-core (1.2.1)
activesupport (>= 4.0.2, < 5)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)

Expand Down Expand Up @@ -45,7 +45,7 @@ GEM
rb-kqueue (>= 0.2)
metaclass (0.0.4)
method_source (0.8.2)
minitest (5.10.1)
minitest (5.10.2)
mocha (1.1.0)
metaclass (~> 0.0.1)
mocha-on-bacon (0.2.2)
Expand Down Expand Up @@ -98,10 +98,11 @@ PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 4.0.2, < 5)
awesome_print
bacon
cocoapods-core!
codeclimate-test-reporter
codeclimate-test-reporter (~> 0.4.1)
json!
kicker
mocha
Expand All @@ -110,9 +111,9 @@ DEPENDENCIES
pry
rake
rb-fsevent
rubocop
rubocop (~> 0.38.0)
vcr
webmock

BUNDLED WITH
1.13.6
1.15.0
2 changes: 1 addition & 1 deletion cocoapods-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.files = Dir["lib/**/*.rb"] + %w{ README.md LICENSE }
s.require_paths = %w{ lib }

s.add_runtime_dependency 'activesupport', '>= 4.0.2', '< 5'
s.add_runtime_dependency 'activesupport', '>= 4.0.2', '< 6'
s.add_runtime_dependency 'nap', '~> 1.0'
s.add_runtime_dependency 'fuzzy_match', "~> 2.0.4"

Expand Down

0 comments on commit a3ac1d6

Please sign in to comment.