Use released versions of dependencies with ruby 3 support

samvera · Jan 27, 2023 · 9c62aa7 · 9c62aa7
1 parent 18d5b67
commit 9c62aa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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'