Skip to content

Commit

Permalink
Merge pull request #181 from samvera/5.0.1
Browse files Browse the repository at this point in the history
Updating the simple_form dependency to use 5.0.x releases and releases version 5.0.1
  • Loading branch information
Tom Johnson authored Oct 11, 2019
2 parents cb5e36d + 5f7376a commit 40019dd
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ jobs:
default: 1.17.3
rails_version:
type: string
solr_config_path:
type: string
default: '.internal_test_app/solr/conf'
executor:
name: 'samvera/ruby_fcrepo_solr'
ruby_version: << parameters.ruby_version >>
Expand All @@ -25,6 +28,7 @@ jobs:
- samvera/bundle_for_gem:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>
cache_version: '2'
project: hydra-editor
- run:
name: "Download the Code Climate reporter"
Expand All @@ -33,12 +37,13 @@ jobs:
chmod +x ./cc-test-reporter
./cc-test-reporter before-build
- samvera/engine_cart_generate:
cache_key: v1-internal-test-app-{{ checksum "hydra-editor.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
cache_key: v2-internal-test-app-{{ checksum "hydra-editor.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
- samvera/install_solr_core:
solr_config_path: .internal_test_app/solr/config
solr_config_path: << parameters.solr_config_path >>
- samvera/bundle_for_gem:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>
cache_version: '2'
project: hydra-editor
- samvera/rubocop
- samvera/parallel_rspec
Expand Down
10 changes: 10 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# History of hydra-editor releases

## 5.0.1
* 2019-09-30: Update the dependency for the `simple_form` Gem to 5.0.x releases

## 5.0.0
* 2019-03-26: Added CodeClimate [@cjcolvar]
* 2019-03-26: Updates testing for Rails support to releases 5.2.2, 5.1.6.1, and 5.0.7.1 [@cjcolvar]
* 2019-03-26: Updates simple_form to releases 4.1.0 (or later) [@cjcolvar]
* 2019-03-26: Updates engine_cart to release 2.2 [@cjcolvar]
* 2018-08-14: Updates the repository documentation in compliance with the guidelines of the Core Component Maintenance Working Group [@botimer]

## 4.0.2
* 2018-05-10: MultiValue gets values from object methods and attributes [afred]

Expand Down
3 changes: 2 additions & 1 deletion hydra-editor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Gem::Specification.new do |s|
s.add_dependency "almond-rails", '~> 0.1'
s.add_dependency "cancancan", "~> 1.8"
s.add_dependency "rails", ">= 5", "< 6"
s.add_dependency "simple_form", '~> 4.1.0'
s.add_dependency "simple_form", '>= 4.1.0', '< 6.0'
s.add_dependency 'sprockets', '~> 3.7'
s.add_dependency 'sprockets-es6'
s.add_dependency 'thor', '~> 0.19'

Expand Down
2 changes: 1 addition & 1 deletion lib/hydra_editor/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module HydraEditor
VERSION = '5.0.0'.freeze
VERSION = '5.0.1'.freeze
end

0 comments on commit 40019dd

Please sign in to comment.