diff --git a/.circleci/config.yml b/.circleci/config.yml index e98b8f3..e1ecd65 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,10 +62,6 @@ workflows: name: bundle_ruby2-6_rails5-2 ruby_version: 2.6.3 rails_version: 5.2.3 - - bundle_lint_test: - name: bundle_ruby2-6_rails5-1 - ruby_version: 2.6.3 - rails_version: 5.1.7 - bundle_lint_test: name: bundle_ruby2-5_rails6-0 ruby_version: 2.5.5 @@ -74,15 +70,3 @@ workflows: name: bundle_ruby2-5_rails5-2 ruby_version: 2.5.5 rails_version: 5.2.3 - - bundle_lint_test: - name: bundle_ruby2-5_rails5-1 - ruby_version: 2.5.5 - rails_version: 5.1.7 - - bundle_lint_test: - name: bundle_ruby2-4_rails5-2 - ruby_version: 2.4.6 - rails_version: 5.2.3 - - bundle_lint_test: - name: bundle_ruby2-4_rails5-1 - ruby_version: 2.4.6 - rails_version: 5.1.7 diff --git a/Gemfile b/Gemfile index 32b7d35..078a724 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source "https://rubygems.org" +gem 'hydra-head', git: 'https://github.com/samvera/hydra-head' + # Declare your gem's dependencies in hydra-editor.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. diff --git a/hydra-editor.gemspec b/hydra-editor.gemspec index 8a99509..e94a3c4 100644 --- a/hydra-editor.gemspec +++ b/hydra-editor.gemspec @@ -15,13 +15,13 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md", "History.md"] - s.add_dependency "activerecord", "~> 5.0" + s.add_dependency "activerecord", ">= 5.2", "< 7" s.add_dependency "active-fedora", ">= 9.0.0" s.add_dependency "almond-rails", '~> 0.1' s.add_dependency "cancancan", "~> 1.8" - s.add_dependency "rails", ">= 5", "< 6" + s.add_dependency "rails", ">= 5.2", "< 7" s.add_dependency "simple_form", '>= 4.1.0', '< 6.0' - s.add_dependency 'sprockets', '~> 3.7' + s.add_dependency 'sprockets', '>= 3.7' s.add_dependency 'sprockets-es6' s.add_development_dependency "bixby", '~> 3.0' @@ -30,7 +30,7 @@ Gem::Specification.new do |s| s.add_development_dependency "engine_cart", '~> 2.2' s.add_development_dependency 'factory_bot_rails', '~> 4.8' s.add_development_dependency 'fcrepo_wrapper', '~> 0.5' - s.add_development_dependency "hydra-head", '~> 10.5' + s.add_development_dependency "hydra-head", '>= 10.5' s.add_development_dependency "jasmine", '~> 2.3' s.add_development_dependency "pry-byebug" s.add_development_dependency 'rails-controller-testing'