Pin faraday >= 2

.github/workflows/ruby.yml

@@ -14,10 +14,6 @@ jobs:
         ruby: ['3.1', '3.2']
     steps:
     - uses: actions/checkout@v3
-    # required to avoid https://github.com/actions/runner-images/issues/37
-    # because faraday depends on patron, which requires curl headers to build
-    - name: Install cURL Headers
-      run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

Gemfile

@@ -65,6 +65,7 @@ end
 gem 'blacklight', '~> 7.33'
 gem 'rsolr' # required for Blacklight
 gem "geoblacklight", '~> 3.8'
+gem 'faraday', '~> 2.0'
 gem "devise"
 gem "devise-guests", ">= 0.3.3"
 gem 'devise-remote-user'

Gemfile.lock

@@ -553,6 +553,7 @@ DEPENDENCIES
   devise-remote-user
   dlss-capistrano
   factory_bot_rails
+  faraday (~> 2.0)
   geo_monitor (~> 0.7)!
   geoblacklight (~> 3.8)
   honeybadger

scripts/geoserver/set_raster_styles.rb

@@ -18,7 +18,7 @@
 puts "Updating WMS default style for all raster layers on #{geoserver_url}"
 
 conn = Faraday.new(url: geoserver_url) do |faraday|
-  faraday.basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
+  faraday.set_basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
   faraday.adapter :net_http
 end
 

scripts/geoserver/set_wms_default_style.rb

@@ -23,7 +23,7 @@
 puts "Updating WMS default style for all vector layers on #{geoserver_url}"
 
 conn = Faraday.new(url: geoserver_url) do |faraday|
-  faraday.basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
+  faraday.set_basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
   faraday.adapter :net_http
 end
 

scripts/geoserver/update_caching.rb

@@ -15,7 +15,7 @@
 puts "Updating cache defaults for all layers on #{geoserver_url}"
 
 conn = Faraday.new(url: geoserver_url) do |faraday|
-  faraday.basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
+  faraday.set_basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
   faraday.adapter :net_http
 end
 

scripts/geowebcache/add_gridsets.rb

@@ -16,7 +16,7 @@
 puts "Updating gridsets for all layers on #{geoserver_url}"
 
 conn = Faraday.new(url: geoserver_url) do |faraday|
-  faraday.basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
+  faraday.set_basic_auth(ENV.fetch('GEOSERVER_USER', nil), ENV.fetch('GEOSERVER_PASS', nil))
   faraday.adapter :net_http
 end