From 5f7376ad3a7314937ed4ab3560db442db1b06e84 Mon Sep 17 00:00:00 2001 From: GriffinJ Date: Thu, 10 Oct 2019 12:39:00 -0400 Subject: [PATCH] Restoring the dependency for faraday-encoding to older releases; Ensuring that only 3.7.z releases of sprockets are used as dependencies --- .circleci/config.yml | 2 +- hydra-editor.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 91d3faf..62b6d5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ jobs: chmod +x ./cc-test-reporter ./cc-test-reporter before-build - samvera/engine_cart_generate: - cache_key: v2-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: << parameters.solr_config_path >> - samvera/bundle_for_gem: diff --git a/hydra-editor.gemspec b/hydra-editor.gemspec index 0843db3..3d338d5 100644 --- a/hydra-editor.gemspec +++ b/hydra-editor.gemspec @@ -19,9 +19,9 @@ Gem::Specification.new do |s| s.add_dependency "active-fedora", ">= 9.0.0" s.add_dependency "almond-rails", '~> 0.1' s.add_dependency "cancancan", "~> 1.8" - s.add_dependency "faraday-encoding", ">= 0.0.5" s.add_dependency "rails", ">= 5", "< 6" 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'