Update paperclip version. Remove aws sdk v1

Gemfile

@@ -38,12 +38,11 @@ gem 'country_select'
 # Use Paper Trail for containing a full history of our edits.
 gem 'paper_trail'
 gem 'rmagick' # rmagick for image processing
-gem 'paperclip'
+gem 'paperclip', '~> 5.0.0'
+gem 'aws-sdk', '~> 2'
 gem 'action_parameter'
 # AWS SDK for Rails - makes SES integration easy
 gem 'aws-sdk-rails'
-# Paperclip has a hard requirement for aws-sdk version < 2.0 because hey why not?   ...
-gem 'aws-sdk-v1'
 gem 'logger'
 gem 'lograge'
 gem 'summernote-rails'

Gemfile.lock

@@ -89,16 +89,15 @@ GEM
     ast (2.3.0)
     autoprefixer-rails (6.3.6.2)
       execjs
+    aws-sdk (2.6.1)
+      aws-sdk-resources (= 2.6.1)
     aws-sdk-core (2.6.1)
       jmespath (~> 1.0)
     aws-sdk-rails (1.0.1)
       aws-sdk-resources (~> 2)
       railties (>= 3)
     aws-sdk-resources (2.6.1)
       aws-sdk-core (= 2.6.1)
-    aws-sdk-v1 (1.66.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
     bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
@@ -124,8 +123,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chunky_png (1.3.8)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -288,7 +286,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.0)
+    mimemagic (0.3.2)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
     money (6.7.1)
@@ -326,12 +324,12 @@ GEM
       activerecord (>= 3.0, < 6.0)
       activesupport (>= 3.0, < 6.0)
       request_store (~> 1.1)
-    paperclip (4.3.6)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    paperclip (5.0.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
     parser (2.3.1.2)
       ast (~> 2.2)
     pg (0.18.4)
@@ -535,8 +533,8 @@ DEPENDENCIES
   activeadmin!
   airbrake
   annotate
+  aws-sdk (~> 2)
   aws-sdk-rails
-  aws-sdk-v1
   bcrypt (~> 3.1.7)
   bootstrap-sass (~> 3.3.5)
   braintree (~> 2.54.0)
@@ -578,7 +576,7 @@ DEPENDENCIES
   newrelic_rpm
   omniauth-google-oauth2
   paper_trail
-  paperclip
+  paperclip (~> 5.0.0)
   pg
   poltergeist
   puma (~> 2.15.3)

circle.yml

@@ -45,7 +45,7 @@ deployment:
       - ./bin/build.sh
       - ./bin/deploy.sh $CIRCLE_SHA1 'champaign' 'env-production' 'champaign-assets-production' 'logs3.papertrailapp.com:44107' 'actions.sumofus.org'
   staging:
-    branch: development
+    branch: update.paperclip
     commands:
       - ./bin/build.sh
       - ./bin/deploy.sh $CIRCLE_SHA1 'champaign' 'champaign-staging' 'champaign-assets-staging' 'logs3.papertrailapp.com:34848' 'action-staging.sumofus.org'