use newer mysql and make 5-2-stable the default
This commit is contained in:
parent
8141318e93
commit
99cbc190ad
|
@ -4,3 +4,4 @@ Gemfile.lock
|
||||||
pkg/*
|
pkg/*
|
||||||
coverage/*
|
coverage/*
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.byebug_history
|
||||||
|
|
10
Gemfile
10
Gemfile
|
@ -3,7 +3,7 @@ gemspec
|
||||||
|
|
||||||
gem 'rake'
|
gem 'rake'
|
||||||
|
|
||||||
rails = ENV['RAILS'] || '5-0-stable'
|
rails = ENV['RAILS'] || '5-2-stable'
|
||||||
|
|
||||||
gem 'pry'
|
gem 'pry'
|
||||||
|
|
||||||
|
@ -22,9 +22,6 @@ when /^v/ # A tagged version
|
||||||
gem 'activerecord', require: false
|
gem 'activerecord', require: false
|
||||||
gem 'actionpack'
|
gem 'actionpack'
|
||||||
end
|
end
|
||||||
if rails >= 'v5.2.0'
|
|
||||||
gem 'mysql2', '~> 0.4.4'
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
git 'git://github.com/rails/rails.git', :branch => rails do
|
git 'git://github.com/rails/rails.git', :branch => rails do
|
||||||
gem 'activesupport'
|
gem 'activesupport'
|
||||||
|
@ -32,13 +29,8 @@ else
|
||||||
gem 'activerecord', require: false
|
gem 'activerecord', require: false
|
||||||
gem 'actionpack'
|
gem 'actionpack'
|
||||||
end
|
end
|
||||||
if rails == '3-0-stable'
|
|
||||||
gem 'mysql2', '< 0.3'
|
|
||||||
end
|
end
|
||||||
if rails == '5-2-stable'
|
|
||||||
gem 'mysql2', '~> 0.4.4'
|
gem 'mysql2', '~> 0.4.4'
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
# TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.
|
# TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.
|
||||||
|
|
Loading…
Reference in New Issue