diff --git a/.travis.yml b/.travis.yml index 8cf2a6a..fd18c0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ --- sudo: false rvm: -- 2.1.5 +- 2.5.0 gemfile: -- gemfiles/activerecord-4.2/Gemfile.mysql2 -- gemfiles/activerecord-4.2/Gemfile.postgresql -- gemfiles/activerecord-4.2/Gemfile.sqlite3 +- gemfiles/activerecord-5.2/Gemfile.mysql2 +- gemfiles/activerecord-5.2/Gemfile.postgresql +- gemfiles/activerecord-5.2/Gemfile.sqlite3 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis addons: postgresql: '9.4' diff --git a/README.md b/README.md index 3060b65..ec8417b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ SchemaPlus::Views is tested on: -* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql** +* ruby **2.5.0** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql** diff --git a/gemfiles/activerecord-4.2/Gemfile.base b/gemfiles/activerecord-5.2/Gemfile.base similarity index 58% rename from gemfiles/activerecord-4.2/Gemfile.base rename to gemfiles/activerecord-5.2/Gemfile.base index ad6a424..efbdc60 100644 --- a/gemfiles/activerecord-4.2/Gemfile.base +++ b/gemfiles/activerecord-5.2/Gemfile.base @@ -1,3 +1,3 @@ eval File.read File.expand_path('../../Gemfile.base', __FILE__) -gem "activerecord", "~> 4.2.6" +gem "activerecord", ">= 5.2.0.beta0", "< 5.3" diff --git a/gemfiles/activerecord-4.2/Gemfile.mysql2 b/gemfiles/activerecord-5.2/Gemfile.mysql2 similarity index 82% rename from gemfiles/activerecord-4.2/Gemfile.mysql2 rename to gemfiles/activerecord-5.2/Gemfile.mysql2 index 9ce0bb5..f6e58e3 100644 --- a/gemfiles/activerecord-4.2/Gemfile.mysql2 +++ b/gemfiles/activerecord-5.2/Gemfile.mysql2 @@ -2,7 +2,7 @@ require "pathname" eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding) platform :ruby do - gem "mysql2", '>= 0.3.18', '< 0.5' + gem "mysql2" end platform :jruby do diff --git a/gemfiles/activerecord-4.2/Gemfile.postgresql b/gemfiles/activerecord-5.2/Gemfile.postgresql similarity index 97% rename from gemfiles/activerecord-4.2/Gemfile.postgresql rename to gemfiles/activerecord-5.2/Gemfile.postgresql index 2c00e63..d47da55 100644 --- a/gemfiles/activerecord-4.2/Gemfile.postgresql +++ b/gemfiles/activerecord-5.2/Gemfile.postgresql @@ -7,4 +7,4 @@ end platform :jruby do gem 'activerecord-jdbcpostgresql-adapter' -end \ No newline at end of file +end diff --git a/gemfiles/activerecord-4.2/Gemfile.sqlite3 b/gemfiles/activerecord-5.2/Gemfile.sqlite3 similarity index 100% rename from gemfiles/activerecord-4.2/Gemfile.sqlite3 rename to gemfiles/activerecord-5.2/Gemfile.sqlite3 diff --git a/schema_dev.yml b/schema_dev.yml index da8c12b..10129cb 100644 --- a/schema_dev.yml +++ b/schema_dev.yml @@ -1,7 +1,7 @@ ruby: - - 2.1.5 + - 2.5.0 activerecord: - - 4.2 + - 5.2 db: - mysql2 - sqlite3 diff --git a/schema_plus_views.gemspec b/schema_plus_views.gemspec index 42e46dc..9834d20 100644 --- a/schema_plus_views.gemspec +++ b/schema_plus_views.gemspec @@ -17,13 +17,13 @@ Gem::Specification.new do |gem| gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] - gem.add_dependency "activerecord", "~> 4.2" - gem.add_dependency "schema_plus_core", "~> 1.0" + gem.add_dependency "activerecord", ">= 4.2", "< 5.3" + gem.add_dependency "schema_plus_core", "~> 2.1.1" gem.add_development_dependency "bundler", "~> 1.7" gem.add_development_dependency "rake", "~> 10.0" gem.add_development_dependency "rspec", "~> 3.0" - gem.add_development_dependency "schema_dev", "~> 3.6" + gem.add_development_dependency "schema_dev", "~> 3.11.0" gem.add_development_dependency "simplecov" gem.add_development_dependency "simplecov-gem-profile" end