From 125a51dc53e6db9058f88962f9ba5345e8ad32ca Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Wed, 29 Mar 2023 13:51:11 -0500
Subject: [PATCH] Upgrade to geoblacklight 4.0

---
 Gemfile      |  4 ++--
 Gemfile.lock | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index ff24d9a2..078fc1f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ end
 
 gem 'blacklight', '~> 7.33'
 gem 'rsolr' # required for Blacklight
-gem "geoblacklight", '~> 3.7'
+gem "geoblacklight", '~> 4.0'
 gem "devise"
 gem "devise-guests", ">= 0.3.3"
 gem 'devise-remote-user'
@@ -82,4 +82,4 @@ gem 'whenever', require: false
 gem 'bootstrap', '~> 4.0'
 gem 'rack-attack' # For throttle configuration
 gem 'recaptcha', '>= 5.4.1'
-gem 'http'
+gem 'http'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4deb6c35..7fa08a5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -259,23 +259,20 @@ GEM
       patron (>= 0.4.2)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    geoblacklight (3.7.0)
-      blacklight (~> 7.8)
+    geoblacklight (4.0.0)
+      blacklight (~> 7.12)
       coderay
       config
       deprecation
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0.0.rc1)
+      faraday (>= 1.0)
       geo_combine (~> 0.4)
       handlebars_assets
       mime-types
-      rails (>= 5.2.4, < 7.1)
+      rails (>= 6.1, < 7.1)
       rgeo-geojson
     git (1.18.0)
       addressable (~> 2.8)
@@ -562,6 +559,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -586,7 +584,7 @@ DEPENDENCIES
   factory_bot_rails
   geo_combine!
   geo_monitor (~> 0.7)!
-  geoblacklight (~> 3.7)
+  geoblacklight (~> 4.0)
   honeybadger
   http
   jbuilder (~> 2.5)