Merge pull request #3247 from projectblacklight/drop-blacklight7

Remove active support for Blacklight 7

Author: corylown

.github/workflows/ruby.yml

@@ -14,25 +14,20 @@ jobs:
         rails_version: ["~> 7.2"]
         ruby: ["3.2", "3.3"]
         bootstrap_version: ["~> 4.0"]
-        blacklight_version: ["~> 7.34"]
+        blacklight_version: ["~> 8.0"]
         additional_engine_cart_rails_options: ["-a propshaft -j esbuild"]
         additional_name: [""]
         include:
           - rails_version: "~> 7.2"
             ruby: "3.3"
-            blacklight_version: "~> 7.38"
+            blacklight_version: "~> 8.0"
             bootstrap_version: "~> 5.0"
             additional_name: Bootstrap 5
           - rails_version: "7.1.4"
             ruby: "3.2"
-            blacklight_version: "~> 7.38"
-            bootstrap_version: "~> 4.0"
-            additional_name: Rails 7.1
-          - rails_version: "~> 7.2"
-            ruby: "3.3"
             blacklight_version: "~> 8.0"
             bootstrap_version: "~> 4.0"
-            additional_name: Blacklight 8
+            additional_name: Rails 7.1
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}

blacklight-spotlight.gemspec

@@ -22,7 +22,7 @@ these collections.)
 
   s.add_dependency 'activejob-status'
   s.add_dependency 'acts-as-taggable-on', '>= 5.0', '< 12'
-  s.add_dependency 'blacklight', '>= 7.38', '< 9'
+  s.add_dependency 'blacklight', '~> 8.0'
   s.add_dependency 'blacklight-gallery', '>= 3.0', '< 5'
   s.add_dependency 'bootstrap_form', '>= 4.1', '< 6'
   s.add_dependency 'cancancan'

lib/generators/spotlight/assets/propshaft_generator.rb

@@ -74,11 +74,6 @@ def add_javascript
         gsub_file 'app/javascript/application.js', 'import "controllers"', '// import "controllers"'
 
         append_to_file 'app/javascript/application.js', "\n// Bootstrap\nimport * as Bootstrap from 'bootstrap'\n"
-
-        if Blacklight::VERSION.start_with?('7')
-          append_to_file 'app/javascript/application.js', "\n// Blacklight\nimport \"blacklight-frontend/app/assets/javascripts/blacklight/blacklight.js\"\n"
-        end
-
         append_to_file 'app/javascript/application.js', "\n// Spotlight\nimport Spotlight from \"spotlight-frontend\"\n"
       end
 

package.json

@@ -32,7 +32,7 @@
     "not IE 11"
   ],
   "dependencies": {
-    "blacklight-frontend": ">= 7.38 < 9",
+    "blacklight-frontend": "^8.4.0",
     "bootstrap": ">=4.3.1 <6.0.0",
     "clipboard": "^2.0.11",
     "jquery": "^3.7.1",

spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -10,7 +10,7 @@ def use_capybara3
   end
 
   def add_gems
-    gem 'blacklight', ENV['BLACKLIGHT_VERSION'] || '~> 7.38' unless Bundler.locked_gems.dependencies.key? 'blacklight'
+    gem 'blacklight', ENV['BLACKLIGHT_VERSION'] || '~> 8.0' unless Bundler.locked_gems.dependencies.key? 'blacklight'
     gem 'blacklight-gallery', '~> 4.5' unless Bundler.locked_gems.dependencies.key? 'blacklight-gallery'
     gem 'cssbundling-rails' unless defined?(Sprockets)
 

template.rb

@@ -9,7 +9,7 @@
 bootstrap_version = ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3')
 
 # Add gem dependencies to the application
-gem 'blacklight', ' ~> 7.38'
+gem 'blacklight', '~> 8.0'
 gem 'blacklight-spotlight', ENV['SPOTLIGHT_GEM'] ? { path: ENV['SPOTLIGHT_GEM'] } : { github: 'projectblacklight/spotlight' }
 gem 'sidekiq'
 gem 'bootstrap_form', /(\d)(?:\.\d){0,2}/.match(bootstrap_version)[1].to_i == 5 ? '~> 5.4' : '~> 4.5'