From daee0cc247488ff2bb6c78171c16162fd8c159cf Mon Sep 17 00:00:00 2001 From: Tom Johnson Date: Wed, 4 Sep 2019 12:42:18 -0700 Subject: [PATCH 1/2] Move SolrService deprecation target to 4.0 The new interfaces will first be released in 3.0.0, so we can't remove the old ones until 4.0. --- app/services/hyrax/solr_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/hyrax/solr_service.rb b/app/services/hyrax/solr_service.rb index c33d4e62bf..94f03174ef 100644 --- a/app/services/hyrax/solr_service.rb +++ b/app/services/hyrax/solr_service.rb @@ -110,7 +110,7 @@ def rows_warning end def rsolr_call_warning - "Calling Hyrax::SolrService.instance are deprecated and support will be removed from Hyrax 3.0. Use methods in Hyrax::SolrService instead." + "Calls to Hyrax::SolrService.instance are deprecated and support will be removed from Hyrax 4.0. Use methods in Hyrax::SolrService instead." end end end From d465d2a04697e679cdaa9b157618442c68444e9f Mon Sep 17 00:00:00 2001 From: Tom Johnson Date: Wed, 4 Sep 2019 14:34:11 -0700 Subject: [PATCH 2/2] Add frozen_string_literal pragma --- app/services/hyrax/solr_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/hyrax/solr_service.rb b/app/services/hyrax/solr_service.rb index 94f03174ef..245e6a214f 100644 --- a/app/services/hyrax/solr_service.rb +++ b/app/services/hyrax/solr_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Hyrax ## # Supports a range of basic Solr interactions.