blacklight 7.43.1 → 8.0.0.beta1

data/.solr_wrapper.yml

@@ -1,7 +1,5 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
-env:
-  SOLR_MODULES: analysis-extras
 collection:
-  dir: lib/generators/blacklight/templates/solr/
+  dir: lib/generators/blacklight/templates/solr/conf
   name: blacklight-core

data/Gemfile

@@ -10,10 +10,10 @@ group :test do
 end
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.10.0
-# engine_cart stanza: 0.10.0
+# engine_cart: 2.5.0
+# engine_cart stanza: 2.5.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV.fetch('ENGINE_CART_DESTINATION') { ENV.fetch('RAILS_ROOT') { File.expand_path('.internal_test_app', File.dirname(__FILE__)) } })
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -23,7 +23,6 @@ if File.exist?(file)
   end
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
@@ -33,8 +32,14 @@ else
     end
   end
 
-  unless ENV['VIEW_COMPONENT_VERSION'].to_s == ""
-    gem 'view_component', ENV.fetch('VIEW_COMPONENT_VERSION')
+  case ENV['RAILS_VERSION'].to_s
+  when /^(~> ?)?6\.0/
+    gem 'sass-rails', '>= 6'
+    gem 'webpacker', '~> 4.0'
+  when /^5.[12]/
+    gem 'sass-rails', '~> 5.0'
+    gem 'sprockets', '~> 3.7'
+    gem 'thor', '~> 0.20'
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,5 +1,8 @@
 # Blacklight
 
+![CI Workflow](https://github.com/projectblacklight/blacklight/actions/workflows/ruby.yml/badge.svg)
+
+
 Blacklight is an open source Solr user interface discovery platform.
 You can use Blacklight to enable searching and browsing of your collections.
 Blacklight uses the [Apache Solr](http://lucene.apache.org/solr) search engine
@@ -31,11 +34,16 @@ rails generate blacklight:install
 * [Issue Tracker](https://github.com/projectblacklight/blacklight/issues)
 * [Support](https://github.com/projectblacklight/blacklight/wiki/Support)
 
+## Browser Compatibility
+
+Blacklight assumes a modern browser with support for ES6. This means we explicitly do not support Internet Explorer 11.
+
 ## Dependencies
 
-* Ruby 2.2+
-* Bundler
-* Rails 6.1+
+* [Ruby](https://www.ruby-lang.org/) 2.7+
+* [Ruby on Rails](https://rubyonrails.org/) 6.1+
+
+Blacklight aims to support the currently [supported versions of Ruby](https://www.ruby-lang.org/en/downloads/branches/) and the [supported versions of Ruby on Rails](https://guides.rubyonrails.org/maintenance_policy.html).  We aim to keep our [test configuration](blob/main/.github/workflows/ruby.yml) up to date with these supported versions.
 
 ## Contributing Code
 

data/VERSION

@@ -1 +1 @@
-7.43.1
+8.0.0.beta1