Update Gemfile/gemspec dependencies for Rails 5/master

This commit is contained in:
Benjamin Fleischer
2015-11-10 00:39:25 -06:00
parent d2a11678ef
commit 7d707aabdc
2 changed files with 9 additions and 2 deletions

View File

@@ -11,11 +11,13 @@ version = ENV['RAILS_VERSION'] || '4.2'
if version == 'master'
gem 'rack', github: 'rack/rack'
gem 'arel', github: 'rails/arel'
git 'https://github.com/rails/rails.git' do
gem 'railties'
gem 'activesupport'
gem 'activemodel'
gem 'actionpack'
gem 'activerecord', group: :test
# Rails 5
gem 'actionview'
end
@@ -27,6 +29,7 @@ else
gem 'activesupport', gem_version
gem 'activemodel', gem_version
gem 'actionpack', gem_version
gem 'activerecord', gem_version, group: :test
end
# https://github.com/bundler/bundler/blob/89a8778c19269561926cea172acdcda241d26d23/lib/bundler/dependency.rb#L30-L54
@@ -36,11 +39,9 @@ end
gem 'tzinfo-data', platforms: (@windows_platforms + [:jruby])
group :test do
gem 'activerecord'
gem 'sqlite3', platform: (@windows_platforms + [:ruby])
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
gem 'minitest-reporters', require: false, group: :development
gem 'codeclimate-test-reporter', require: false
gem 'simplecov', '~> 0.10', require: false, group: :development
end