Skip to content

Commit

Permalink
Bumping versions of dependencies to support Rails 6
Browse files Browse the repository at this point in the history
Co-Authored-By: Anna Headley <[email protected]>
Co-Authored-By: Daniel Pierce <[email protected]>
  • Loading branch information
3 people committed Nov 18, 2020
1 parent ae956a3 commit 27907c7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
16 changes: 0 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 4 additions & 4 deletions hydra-editor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down

0 comments on commit 27907c7

Please sign in to comment.