From 466f7030c6d211cfda3578ccdf003358ed56ff00 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 10 May 2021 21:37:36 +0100
Subject: [PATCH 1/2] Depend on select2-rails without the thor v0.14
 requirement

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 258cb99cc2..cd75cf9af6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ gem 'foundation-rails', '= 5.5.2.1'
 gem 'jquery-migrate-rails'
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
-gem 'select2-rails', '~> 3.4.7'
+gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
 # Thor v0.20 works with both select2-rails 3.4.7 and railties 6.0.3.6
 #   To upgrade to thor v1 we need to upgrade select2-rails to v3.5 which requires some work
 gem 'thor', '~> 0.20'
diff --git a/Gemfile.lock b/Gemfile.lock
index 301295bb97..e967e0c0cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,6 +21,15 @@ GIT
   specs:
     ofn-qz (0.1.0)
 
+GIT
+  remote: https://github.com/openfoodfoundation/select2-rails.git
+  revision: fc240e85fbdf1878ff3c39d972c0cd9a312f5ed4
+  branch: v349_with_thor_v1
+  specs:
+    select2-rails (3.4.9)
+      sass-rails
+      thor (>= 0.14)
+
 PATH
   remote: engines/catalog
   specs:
@@ -563,9 +572,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    select2-rails (3.4.9)
-      sass-rails
-      thor (~> 0.14)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -764,7 +770,7 @@ DEPENDENCIES
   rubocop-rails
   sass (~> 3.4.0)
   sass-rails (< 5.1.0)
-  select2-rails (~> 3.4.7)
+  select2-rails!
   selenium-webdriver
   shoulda-matchers
   sidekiq

From 66934af5796df3f75162d8c722570385571d22fe Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 10 May 2021 21:38:07 +0100
Subject: [PATCH 2/2] Upgrade to thor v1

---
 Gemfile      | 3 ---
 Gemfile.lock | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index cd75cf9af6..3b6f624145 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,9 +113,6 @@ gem 'jquery-migrate-rails'
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
 gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
-# Thor v0.20 works with both select2-rails 3.4.7 and railties 6.0.3.6
-#   To upgrade to thor v1 we need to upgrade select2-rails to v3.5 which requires some work
-gem 'thor', '~> 0.20'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e967e0c0cd..da2fde11e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -617,7 +617,7 @@ GEM
     test-prof (1.0.5)
     test-unit (3.4.2)
       power_assert
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
     thwait (0.2.0)
       e2mmap
@@ -783,7 +783,6 @@ DEPENDENCIES
   stripe
   test-prof
   test-unit (~> 3.4)
-  thor (~> 0.20)
   timecop
   uglifier (>= 1.0.3)
   unicorn-rails