From 9757859c7185b8f71d6f7050f2ed31d3132986ac Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@carto.com>
Date: Tue, 20 Oct 2020 10:49:45 +0200
Subject: [PATCH] Add cartodb-common as a git submodule

This is a bit of a hack to improve development speed
---
 .gitmodules           |  3 +++
 Gemfile               |  2 +-
 Gemfile.lock          | 11 +----------
 lib/carto/common      |  1 +
 vendor/cartodb-common |  1 +
 5 files changed, 7 insertions(+), 11 deletions(-)
 create mode 120000 lib/carto/common
 create mode 160000 vendor/cartodb-common

diff --git a/.gitmodules b/.gitmodules
index ee1e50b7ce..2ff5246b99 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/sql"]
 	path = lib/sql
 	url = git://github.com/CartoDB/cartodb-postgresql.git
+[submodule "vendor/cartodb-common"]
+	path = vendor/cartodb-common
+	url = https://github.com/CartoDB/cartodb-common.git
diff --git a/Gemfile b/Gemfile
index b594a56d1c..0aba131e90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,7 @@ group :assets do
   gem "compass",               "1.0.3"
 end
 
-gem 'cartodb-common', git: 'https://github.com/cartodb/cartodb-common.git', tag: 'v0.3.7'
+gem 'argon2',                   '~> 2.0' # needed by cartodb-common Argon2EncryptionStrategy
 gem 'roo',                     '1.13.2'
 gem 'state_machines-activerecord', '~> 0.5.0'
 gem 'typhoeus',                '1.3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index c516b14a42..720d3cb4b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,15 +6,6 @@ GIT
     oauth-plugin (0.4.0.pre4)
       oauth (>= 0.4.4)
 
-GIT
-  remote: https://github.com/cartodb/cartodb-common.git
-  revision: f098950c5fee57686718fea112d198e6e5e3dfd9
-  tag: v0.3.7
-  specs:
-    cartodb-common (0.3.6)
-      activesupport (~> 4.2.11.3)
-      argon2 (~> 2.0)
-
 GIT
   remote: https://github.com/kuldeepaggarwal/fake_net_ldap.git
   revision: d99f2fcf13b9737a150f869fe9b9fbc0d788aa3f
@@ -528,12 +519,12 @@ DEPENDENCIES
   activerecord-postgresql-adapter
   addressable (~> 2.5)
   analytics-ruby (~> 2.0.0)
+  argon2 (~> 2.0)
   avro (~> 1.10.0)
   aws-sdk-acmpca (~> 1)
   aws-sdk-s3 (~> 1)
   byebug
   capybara (= 2.18.0)
-  cartodb-common!
   charlock_holmes (= 0.7.6)
   ci_reporter (= 1.8.4)
   compass (= 1.0.3)
diff --git a/lib/carto/common b/lib/carto/common
new file mode 120000
index 0000000000..049a1d8e79
--- /dev/null
+++ b/lib/carto/common
@@ -0,0 +1 @@
+../../vendor/cartodb-common/lib/carto/common
\ No newline at end of file
diff --git a/vendor/cartodb-common b/vendor/cartodb-common
new file mode 160000
index 0000000000..85f1132fef
--- /dev/null
+++ b/vendor/cartodb-common
@@ -0,0 +1 @@
+Subproject commit 85f1132fef28eb4cecd22082a8451499ceb94904