Merge pull request #39 from tf/pageflow-17

Support Pageflow 17
codevise · Jan 12, 2024 · b1d47f4 · b1d47f4
2 parents e4abfdf + 497a9b9
commit b1d47f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,4 @@ if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental'
     gem 'pageflow'
     gem 'pageflow-support'
   end
-else
-  # Speed up dependency resolution
-  gem 'rails', '~> 5.2.0'
 end
diff --git a/pageflow-panorama.gemspec b/pageflow-panorama.gemspec
@@ -18,21 +18,16 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_runtime_dependency 'pageflow', ['>= 15.0', '< 17']
+  spec.add_runtime_dependency 'pageflow', ['>= 15.0', '< 18']
   spec.add_runtime_dependency 'rubyzip', '~> 1.1'
   spec.add_runtime_dependency 'aws-sdk-s3', '~> 1.17'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
-  spec.add_development_dependency 'pageflow-support', ['>= 15.0', '< 17']
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
-  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'factory_bot_rails', '~> 4.8'
-
-  if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental'
-    spec.add_development_dependency 'rspec-rails', '~> 6.0'
-  else
-    spec.add_development_dependency 'rspec-rails', '~> 3.7'
-  end
+  spec.add_development_dependency 'pageflow-support', ['>= 15.0', '< 18']
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec-rails', '~> 6.0'
 
   # Semantic versioning rake tasks
   spec.add_development_dependency 'semmy', '~> 1.0'