Skip to content

Commit 1b9e1bb

Browse files
committed
Downgrade aws-sdk-s3 to aws-sdk
Works around thoughtbot/paperclip#2481 and thoughtbot/paperclip#2484
1 parent 1c21c18 commit 1b9e1bb

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ gem 'rolify'
2828
gem 'twitter'
2929

3030
# Attachments
31-
gem 'aws-sdk-s3'
31+
gem 'aws-sdk', '< 3.0'
3232
gem 'delayed_paperclip'
3333
gem 'image_optim', require: false
3434
gem 'image_optim_pack', require: false

Gemfile.lock

+6-11
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,13 @@ GEM
8080
arel (6.0.4)
8181
attr_encrypted (3.0.3)
8282
encryptor (~> 3.0.0)
83-
aws-partitions (1.45.0)
84-
aws-sdk-core (3.11.0)
85-
aws-partitions (~> 1.0)
83+
aws-sdk (2.10.100)
84+
aws-sdk-resources (= 2.10.100)
85+
aws-sdk-core (2.10.100)
8686
aws-sigv4 (~> 1.0)
8787
jmespath (~> 1.0)
88-
aws-sdk-kms (1.3.0)
89-
aws-sdk-core (~> 3)
90-
aws-sigv4 (~> 1.0)
91-
aws-sdk-s3 (1.8.0)
92-
aws-sdk-core (~> 3)
93-
aws-sdk-kms (~> 1)
94-
aws-sigv4 (~> 1.0)
88+
aws-sdk-resources (2.10.100)
89+
aws-sdk-core (= 2.10.100)
9590
aws-sigv4 (1.0.2)
9691
bcrypt (3.1.11)
9792
benchmark-ips (2.7.2)
@@ -608,7 +603,7 @@ DEPENDENCIES
608603
algoliasearch-rails
609604
annotate
610605
attr_encrypted (~> 3.0.0)
611-
aws-sdk-s3
606+
aws-sdk (< 3.0)
612607
bcrypt
613608
benchmark-ips
614609
chewy

0 commit comments

Comments
 (0)