From 40588443511bd938c2dc2e0bdd1bf325a77fa292 Mon Sep 17 00:00:00 2001
From: Joe Haig <joseph.haig@digital.justice.gov.uk>
Date: Thu, 15 Apr 2021 10:57:11 +0100
Subject: [PATCH] Update googlemaps-services for Ruby 2.7 support

This is using this branch on Github:

  https://github.com/jrmhaig/googlemaps-services/tree/update_http

One it has been merged and a new version released then that should be
used instead (see https://github.com/amrfaissal/googlemaps-services/pull/13)
---
 Gemfile      |  4 +++-
 Gemfile.lock | 29 ++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3f689189cd..6d40d46752 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,9 @@ gem 'dotenv-rails'
 gem 'dry-monads',             '~> 1.3.5'
 gem 'factory_bot_rails',      '~> 6.1.0'
 gem 'faker',                  '~> 2.17.0'
-gem 'googlemaps-services',    '~> 1.5.0'
+# See https://github.com/amrfaissal/googlemaps-services/pull/13
+# gem 'googlemaps-services',    '> 1.5.0'
+gem 'googlemaps-services', git: 'https://github.com/jrmhaig/googlemaps-services', branch: 'update_http'
 gem 'gov_uk_date_fields',     '~> 3.0.0'
 gem 'govuk_design_system_formbuilder', '~> 2.1'
 gem 'govuk_frontend_toolkit', '~> 8.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index af6160e144..f97af4b5a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,6 +9,15 @@ GIT
       eventmachine (>= 0.12.8)
       rufus-scheduler (~> 2.0.24)
 
+GIT
+  remote: https://github.com/jrmhaig/googlemaps-services
+  revision: 46856ace98d1347654af10809217ee66d24b28bf
+  branch: update_http
+  specs:
+    googlemaps-services (1.5.0)
+      http (~> 4.3)
+      nokogiri (~> 1.7, >= 1.7.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -286,15 +295,15 @@ GEM
       ruby2_keywords
     faraday-net_http (1.0.1)
     ffi (1.15.0)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     formatador (0.2.5)
     geckoboard-ruby (0.4.0)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    googlemaps-services (1.5.0)
-      http (~> 3.0, >= 3.0.0)
-      nokogiri (~> 1.7, >= 1.7.1)
     gov_uk_date_fields (3.0.0)
       rails (>= 5.0)
     govuk_design_system_formbuilder (2.1.5)
@@ -383,15 +392,17 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    http (3.3.0)
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.3.0)
+    http-parser (1.2.3)
+      ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.6.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
@@ -730,7 +741,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     unicorn (6.0.0)
       kgio (~> 2.6)
@@ -815,7 +826,7 @@ DEPENDENCIES
   factory_bot_rails (~> 6.1.0)
   faker (~> 2.17.0)
   geckoboard-ruby
-  googlemaps-services (~> 1.5.0)
+  googlemaps-services!
   gov_uk_date_fields (~> 3.0.0)
   govuk_design_system_formbuilder (~> 2.1)
   govuk_elements_rails (~> 3.1.2)