From 9c62aa7e53ae70fcb487a593316ae6afa2b65586 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Fri, 27 Jan 2023 14:51:31 -0500 Subject: [PATCH] Use released versions of dependencies with ruby 3 support --- Gemfile | 8 +++----- spec/test_app_templates/Gemfile.extra | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 75ce99dc..eb1abd97 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source "https://rubygems.org" gem 'rspec-its' -gem 'active-triples', git: 'https://github.com/samvera-labs/activetriples.git', branch: 'merge-gitlab-upstream' # Specify gem dependencies in hydra-head.gemspec gemspec @@ -52,10 +51,9 @@ if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5/ gem 'psych', '< 4' end -gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'ruby3' -#if ENV['ACTIVE_FEDORA_VERSION'] -# gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] -#end +if ENV['ACTIVE_FEDORA_VERSION'] + gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] +end if ENV['BLACKLIGHT_VERSION'] gem 'blacklight', ENV['BLACKLIGHT_VERSION'] diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra index a60bbee4..e8888cb7 100644 --- a/spec/test_app_templates/Gemfile.extra +++ b/spec/test_app_templates/Gemfile.extra @@ -1,10 +1,8 @@ gem 'byebug' unless ENV['CI'] -gem 'active-triples', git: 'https://github.com/samvera-labs/activetriples.git', branch: 'merge-gitlab-upstream' -gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'ruby3' -#if ENV['ACTIVE_FEDORA_VERSION'] -# gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] -#end +if ENV['ACTIVE_FEDORA_VERSION'] + gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] +end if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^6.0/ || ENV['RAILS_VERSION'] =~ /^5/ gem 'psych', '< 4'