Merge pull request #693 from airblade/fix_slow_bundler_resolution

Various gemfile changes
This commit is contained in:
Jared Beck 2016-01-15 01:06:08 -05:00
commit a80c23f8ed
2 changed files with 12 additions and 19 deletions

View File

@ -8,22 +8,15 @@
# > https://github.com/thoughtbot/appraisal
appraise "ar3" do
gem "activerecord", "~> 3.2"
gem "activerecord", "~> 3.2.22"
gem "i18n", "~> 0.6.11"
gem "request_store", "~> 1.1.0"
group :development, :test do
gem 'railties', '~> 3.0'
gem 'test-unit', '~> 3.0'
gem 'railties', '~> 3.2.22'
gem 'test-unit', '~> 3.1.5'
platforms :ruby do
gem 'mysql2', '~> 0.3.20'
gem 'pg', '~> 0.17.1'
end
platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
gem 'activerecord-jdbcmysql-adapter', '~> 1.3'
gem 'activerecord-jdbc-adapter', '1.3.15'
end
end
end

View File

@ -26,22 +26,22 @@ Gem::Specification.new do |s|
s.add_development_dependency 'appraisal', '~> 2.1'
s.add_development_dependency 'rake', '~> 10.4.2'
s.add_development_dependency 'shoulda', '~> 3.5'
s.add_development_dependency 'shoulda', '~> 3.5.0'
s.add_development_dependency 'ffaker', '~> 2.1.0'
s.add_development_dependency 'railties', ['>= 3.0', '< 5.0']
s.add_development_dependency 'sinatra', '~> 1.0'
s.add_development_dependency 'rack-test', '>= 0.6'
s.add_development_dependency 'railties', ['>= 3.0', '< 6.0']
s.add_development_dependency 'sinatra', '~> 1.4.6'
s.add_development_dependency 'rack-test', '~> 0.6.3'
s.add_development_dependency 'rspec-rails', '~> 3.4.0'
s.add_development_dependency 'generator_spec'
s.add_development_dependency 'generator_spec', '~> 0.9.3'
s.add_development_dependency 'database_cleaner', '~> 1.2'
s.add_development_dependency 'pry-nav', '~> 0.2.4'
s.add_development_dependency 'rubocop', '~> 0.35.1'
s.add_development_dependency 'timecop'
s.add_development_dependency 'timecop', '~> 0.8.0'
if defined?(JRUBY_VERSION)
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
s.add_development_dependency 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3'
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.15'
s.add_development_dependency 'activerecord-jdbcpostgresql-adapter', '~> 1.3.15'
s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.15'
else
s.add_development_dependency 'sqlite3', '~> 1.2'
s.add_development_dependency 'pg', '~> 0.17'