diff --git a/.ruby-version b/.ruby-version index 2bf1c1c..2714f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.6.4 diff --git a/.travis.yml b/.travis.yml index bdf321a..304c64c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,28 @@ language: ruby +dist: xenial +services: + - xvfb + rvm: - - 2.2.5 + - 2.6.4 env: + - RAILS_VERSION=6.0.0 - RAILS_VERSION=5.2.0 - - RAILS_VERSION=4.2.0 - - RAILS_VERSION=3.2.22 + +addons: + apt: + packages: + - libqtwebkit-dev + - libqtwebkit4 cache: directories: - - /home/travis/.rvm/gems/ruby-2.2.5 + - /home/travis/.rvm/gems/ruby-2.6.4 install: ./ci/build.sh -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - sleep 3 - script: ./ci/test.sh jobs: diff --git a/Gemfile b/Gemfile index bbd3d73..c9d5c4e 100644 --- a/Gemfile +++ b/Gemfile @@ -9,11 +9,16 @@ gem 'rails', "#{rails_version}" case rails_version.split('.').first when '3' gem 'strong_parameters' -when '4', '5' +when '4', '5', '6' gem 'responders' end -gem 'sqlite3' +case rails_version.split('.').first +when '3', '4', '5' + gem 'sqlite3', '~> 1.3.6' +when '6' + gem 'sqlite3', '~> 1.4.1' +end gem 'rswag-api', path: './rswag-api' gem 'rswag-ui', path: './rswag-ui' diff --git a/rswag-api/rswag-api.gemspec b/rswag-api/rswag-api.gemspec index 299172d..3a14bb2 100644 --- a/rswag-api/rswag-api.gemspec +++ b/rswag-api/rswag-api.gemspec @@ -13,5 +13,5 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile"] - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'railties', '>= 3.1', '< 6.1' end diff --git a/rswag-specs/rswag-specs.gemspec b/rswag-specs/rswag-specs.gemspec index 0e4686e..e3ddaf3 100644 --- a/rswag-specs/rswag-specs.gemspec +++ b/rswag-specs/rswag-specs.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency 'activesupport', '>= 3.1', '< 6.0' - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'activesupport', '>= 3.1', '< 6.1' + s.add_dependency 'railties', '>= 3.1', '< 6.1' s.add_dependency 'json-schema', '~> 2.2' end diff --git a/rswag-ui/rswag-ui.gemspec b/rswag-ui/rswag-ui.gemspec index 5b53548..1584470 100644 --- a/rswag-ui/rswag-ui.gemspec +++ b/rswag-ui/rswag-ui.gemspec @@ -13,6 +13,6 @@ Gem::Specification.new do |s| s.files = Dir.glob("{lib,node_modules}/**/*") + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency 'actionpack', '>=3.1', '< 6.0' - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'actionpack', '>=3.1', '< 6.1' + s.add_dependency 'railties', '>= 3.1', '< 6.1' end