Travis CI: Use compatible mysql2 and jdbc gems

This is required because only activerecord 4.2 works with the latest mysql2 0.4 gem. Also bumping the jdbc adapter to try to fix jruby.
take-five · Jan 9, 2016 · 5dbccc2 · 5dbccc2
1 parent 38f9381
commit 5dbccc2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/gemfiles/rails3.1.gemfile b/gemfiles/rails3.1.gemfile
@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "pg", :platform => :ruby
 gem "sqlite3", :platform => :ruby
-gem "mysql2", :platform => :ruby
+gem "mysql2", "~> 0.3.20", :platform => :ruby
 gem "simplecov", :platform => :ruby
 gem "coveralls", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.2.2", :platform => :jruby

diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile
@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "pg", :platform => :ruby
 gem "sqlite3", :platform => :ruby
-gem "mysql2", :platform => :ruby
+gem "mysql2", "~> 0.3.20", :platform => :ruby
 gem "simplecov", :platform => :ruby
 gem "coveralls", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.2.2", :platform => :jruby

diff --git a/gemfiles/rails4.0.gemfile b/gemfiles/rails4.0.gemfile
@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "pg", :platform => :ruby
 gem "sqlite3", :platform => :ruby
-gem "mysql2", :platform => :ruby
+gem "mysql2", "~> 0.3.20", :platform => :ruby
 gem "simplecov", :platform => :ruby
 gem "coveralls", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.6", :platform => :jruby

diff --git a/gemfiles/rails4.1.gemfile b/gemfiles/rails4.1.gemfile
@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "pg", :platform => :ruby
 gem "sqlite3", :platform => :ruby
-gem "mysql2", :platform => :ruby
+gem "mysql2", "~> 0.3.20", :platform => :ruby
 gem "simplecov", :platform => :ruby
 gem "coveralls", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.6", :platform => :jruby

diff --git a/gemfiles/rails4.2.gemfile b/gemfiles/rails4.2.gemfile
@@ -4,12 +4,12 @@ source "http://rubygems.org"
 
 gem "pg", :platform => :ruby
 gem "sqlite3", :platform => :ruby
-gem "mysql2", :platform => :ruby
+gem "mysql2", "~> 0.4.2", :platform => :ruby
 gem "simplecov", :platform => :ruby
 gem "coveralls", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.6", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.6", :platform => :jruby
+gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.19", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.19", :platform => :jruby
 gem "activerecord", "~> 4.2.0"
-gem "activerecord-jdbcmysql-adapter", "~> 1.3.6", :platform => :jruby
+gem "activerecord-jdbcmysql-adapter", "~> 1.3.19", :platform => :jruby
 
 gemspec :path => "../"