From 74f7eaaf2e43fc054f2ffcbe59bf2d83efe198b2 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Wed, 4 Mar 2020 16:32:40 +0100
Subject: [PATCH] Update spreadsheet_architect

---
 Gemfile      |  1 -
 Gemfile.lock | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5af091a74..247cac509 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,6 @@ gem 'activestorage-openstack'
 gem 'administrate'
 gem 'after_party'
 gem 'anchored'
-gem 'axlsx', '~> 3.0.0.pre' # https://github.com/randym/axlsx/issues/501#issuecomment-373640365
 gem 'bcrypt'
 gem 'bootstrap-sass', '>= 3.4.1'
 gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6265df9f2..4a13d0c21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,14 +97,9 @@ GEM
     attr_required (1.0.1)
     autoprefixer-rails (9.4.4)
       execjs
-    axlsx (3.0.0.pre)
-      htmlentities (~> 4.3, >= 4.3.4)
-      mimemagic (~> 0.3)
-      nokogiri (~> 1.8, >= 1.8.2)
-      rubyzip (~> 1.2, >= 1.2.1)
-    axlsx_styler (0.2.0)
+    axlsx_styler (1.0.0)
       activesupport (>= 3.1)
-      axlsx (>= 2.0, < 4)
+      caxlsx (>= 2.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -140,6 +135,11 @@ GEM
       selenium-webdriver
     case_transform (0.2)
       activesupport
+    caxlsx (3.0.1)
+      htmlentities (~> 4.3, >= 4.3.4)
+      mimemagic (~> 0.3)
+      nokogiri (~> 1.10, >= 1.10.4)
+      rubyzip (>= 1.3.0, < 3)
     chartkick (3.3.1)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
@@ -197,6 +197,7 @@ GEM
     dotenv-rails (2.5.0)
       dotenv (= 2.5.0)
       railties (>= 3.2, < 6.0)
+    dry-inflector (0.2.0)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -531,9 +532,9 @@ GEM
     rgeo (2.0.0)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
-    rodf (1.0.0)
-      activesupport (>= 3.0)
+    rodf (1.1.1)
       builder (>= 3.0)
+      dry-inflector (~> 0.1)
       rubyzip (>= 1.0)
     rouge (3.16.0)
     rspec (3.9.0)
@@ -631,9 +632,9 @@ GEM
       jquery-rails
       kaminari (>= 0.17)
       rails (>= 3.2)
-    spreadsheet_architect (3.2.0)
-      axlsx (>= 2, < 4)
-      axlsx_styler (>= 0.1.7, < 2)
+    spreadsheet_architect (4.0.0)
+      axlsx_styler (>= 1.0.0, < 2)
+      caxlsx (>= 2.0.2, < 4)
       rodf (>= 1.0.0, < 2)
     spring (2.0.2)
       activesupport (>= 4.2)
@@ -724,7 +725,6 @@ DEPENDENCIES
   administrate
   after_party
   anchored
-  axlsx (~> 3.0.0.pre)
   bcrypt
   bootstrap-sass (>= 3.4.1)
   bootstrap-wysihtml5-rails (~> 0.3.3.8)