From 8e03f402b1837dffacb3746ceecdccb3fcc9cf37 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 23 Sep 2019 14:28:50 +0100
Subject: [PATCH] Use Ruby 2.2.10

---
 .ruby-version |  2 +-
 Gemfile       |  7 +++++--
 Gemfile.lock  | 11 +++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 63a1a1ca3c..0d3ad67afa 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.9
+2.2.10
diff --git a/Gemfile b/Gemfile
index 623db5d9a0..830a664651 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby "2.1.9"
+ruby "2.2.10"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
@@ -15,7 +15,8 @@ gem 'nokogiri', '>= 1.6.7.1'
 gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
-gem 'pg'
+gem 'activerecord-postgresql-adapter'
+gem 'pg', '~> 0.21.0'
 
 # OFN-maintained and patched version of Spree v2.0.4. See
 # https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade
@@ -98,6 +99,8 @@ gem 'roo-xls', '~> 1.1.0'
 
 gem 'whenever', require: false
 
+gem 'test-unit', '~> 3.0'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
diff --git a/Gemfile.lock b/Gemfile.lock
index 9fb8456928..08affeb62d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,6 +131,8 @@ GEM
       tzinfo (~> 0.3.29)
     activerecord-import (1.0.2)
       activerecord (>= 3.2)
+    activerecord-postgresql-adapter (0.0.1)
+      pg
     activeresource (3.2.22.5)
       activemodel (= 3.2.22.5)
       activesupport (= 3.2.22.5)
@@ -522,6 +524,7 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.5)
+    power_assert (1.1.5)
     powerpack (0.1.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -671,6 +674,8 @@ GEM
     stripe (4.24.0)
       faraday (~> 0.13)
       net-http-persistent (~> 3.0)
+    test-unit (3.3.3)
+      power_assert
     thor (0.20.3)
     tilt (1.4.1)
     timecop (0.9.1)
@@ -722,6 +727,7 @@ DEPENDENCIES
   active_model_serializers (= 0.8.4)
   activemerchant (~> 1.78)
   activerecord-import
+  activerecord-postgresql-adapter
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.3.0)
@@ -783,7 +789,7 @@ DEPENDENCIES
   order_management!
   paper_trail (~> 5.2.3)
   paperclip (~> 3.4.1)
-  pg
+  pg (~> 0.21.0)
   pry-byebug (>= 3.4.3)
   rabl
   rack-mini-profiler (< 1.0.0)
@@ -814,6 +820,7 @@ DEPENDENCIES
   spring (= 1.7.2)
   spring-commands-rspec
   stripe
+  test-unit (~> 3.0)
   timecop
   truncate_html
   turbo-sprockets-rails3
@@ -828,7 +835,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 2.1.9p490
+   ruby 2.2.10p489
 
 BUNDLED WITH
    1.17.2