From d31208d1e56f3c2f138b8d458754630db9f360ba Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 5 Jun 2021 13:08:36 +0100
Subject: [PATCH] Switch from Figaro to Dotenv for ENV var management

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

diff --git a/Gemfile b/Gemfile
index 9e1d000977..7dc447ce69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 ruby "2.7.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
+gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+
 gem 'rails', '~> 6.1.4'
 
 gem 'activemerchant', '>= 1.78.0'
@@ -70,7 +72,6 @@ gem 'bigdecimal', '3.0.2'
 gem 'bootsnap', require: false
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a4b33a533..b57f433a5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,6 +245,10 @@ GEM
       devise (>= 4.0.0, < 5.0.0)
     diff-lcs (1.4.4)
     docile (1.3.5)
+    dotenv (2.7.6)
+    dotenv-rails (2.7.6)
+      dotenv (= 2.7.6)
+      railties (>= 3.2)
     e2mmap (0.1.0)
     erubi (1.10.0)
     et-orbi (1.2.4)
@@ -267,8 +271,6 @@ GEM
     faraday-net_http_persistent (1.1.0)
     ffaker (2.18.0)
     ffi (1.15.1)
-    figaro (1.2.0)
-      thor (>= 0.14.0, < 2)
     flipper (0.20.4)
     flipper-active_record (0.20.4)
       activerecord (>= 5.0, < 7)
@@ -721,9 +723,9 @@ DEPENDENCIES
   devise-encryptable
   devise-token_authenticatable
   dfc_provider!
+  dotenv-rails
   factory_bot_rails (= 6.2.0)
   ffaker
-  figaro
   flipper
   flipper-active_record
   flipper-ui