From 8f2378eb6f7e09fcbb72b91834daf4247104518c Mon Sep 17 00:00:00 2001 From: gravityslave92 Date: Fri, 6 Sep 2019 12:57:44 +0300 Subject: [PATCH] Remove hinders for migrating to rails 6 --- Gemfile | 4 ++-- rswag-api/open_api-rswag-api.gemspec | 2 +- rswag-specs/open_api-rswag-specs.gemspec | 4 ++-- rswag-ui/open_api-rswag-ui.gemspec | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index ba8c5fd..5b00bb7 100644 --- a/Gemfile +++ b/Gemfile @@ -4,14 +4,14 @@ source 'https://rubygems.org' # Allow the rails version to come from an ENV setting so Travis can test multiple versions. # See http://www.schneems.com/post/50991826838/testing-against-multiple-rails-versions/ -rails_version = ENV['RAILS_VERSION'] || '5.1.2' +rails_version = ENV['RAILS_VERSION'] || '5.2.3' gem 'rails', rails_version.to_s case rails_version.split('.').first when '3' gem 'strong_parameters' -when '4', '5' +when '4', '5', '6' gem 'responders' end diff --git a/rswag-api/open_api-rswag-api.gemspec b/rswag-api/open_api-rswag-api.gemspec index 621a6cd..62f0d43 100644 --- a/rswag-api/open_api-rswag-api.gemspec +++ b/rswag-api/open_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' end diff --git a/rswag-specs/open_api-rswag-specs.gemspec b/rswag-specs/open_api-rswag-specs.gemspec index 7d2b5e6..dce6f11 100644 --- a/rswag-specs/open_api-rswag-specs.gemspec +++ b/rswag-specs/open_api-rswag-specs.gemspec @@ -15,9 +15,9 @@ Gem::Specification.new do |s| s.files = Dir['{lib}/**/*'] + %w[MIT-LICENSE Rakefile] - s.add_dependency 'activesupport', '>= 3.1', '< 6.0' + s.add_dependency 'activesupport', '>= 3.1' s.add_dependency 'json-schema', '~> 2.2' - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'railties', '>= 3.1' s.add_dependency 'hashie' s.add_development_dependency 'guard-rspec' end diff --git a/rswag-ui/open_api-rswag-ui.gemspec b/rswag-ui/open_api-rswag-ui.gemspec index 61c0de5..a9668ae 100644 --- a/rswag-ui/open_api-rswag-ui.gemspec +++ b/rswag-ui/open_api-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' + s.add_dependency 'railties', '>= 3.1' end