From e6a513d973b7093545d1e3c914f5cc164b650044 Mon Sep 17 00:00:00 2001 From: Tim Fischbach Date: Fri, 12 Jan 2024 12:37:43 +0100 Subject: [PATCH] Support Pageflow 17 REDMINE-20487 --- Gemfile | 5 ----- pageflow-vr.gemspec | 11 +++-------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 8d1d891..b9b608d 100644 --- a/Gemfile +++ b/Gemfile @@ -8,9 +8,4 @@ if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental' gem 'pageflow' gem 'pageflow-support' end -else - group :development, :test do - # Help Bundler resolve dependencies - gem 'rails', '~> 5.2.0' - end end diff --git a/pageflow-vr.gemspec b/pageflow-vr.gemspec index 14b4858..5aa9816 100644 --- a/pageflow-vr.gemspec +++ b/pageflow-vr.gemspec @@ -17,18 +17,13 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.1' - spec.add_dependency 'pageflow', ['>= 12.0', '< 17'] + spec.add_dependency 'pageflow', ['>= 12.0', '< 18'] spec.add_dependency 'pageflow-public-i18n', '~> 1.10' spec.add_development_dependency 'bundler', ['>= 1.12', '< 3'] - spec.add_development_dependency 'pageflow-support', ['>= 14', '< 17'] + spec.add_development_dependency 'pageflow-support', ['>= 14', '< 18'] spec.add_development_dependency 'rake', '~> 12.0' - - if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental' - spec.add_development_dependency 'rspec-rails', '~> 6.0' - else - spec.add_development_dependency 'rspec-rails', '~> 3.0' - end + spec.add_development_dependency 'rspec-rails', '~> 6.0' spec.add_development_dependency 'semmy', '~> 1.0' end