Commit d570f1e4 by Tute Costa

Remove AWS v1 support

TODO: Simpify lib/paperclip/storage/s3.rb

See:

* https://github.com/thoughtbot/paperclip/issues/2049
parent 2fe81fb9
...@@ -8,7 +8,6 @@ script: "bundle exec rake clean spec cucumber" ...@@ -8,7 +8,6 @@ script: "bundle exec rake clean spec cucumber"
gemfile: gemfile:
- gemfiles/4.2.awsv2.1.gemfile - gemfiles/4.2.awsv2.1.gemfile
- gemfiles/4.2.awsv2.0.gemfile - gemfiles/4.2.awsv2.0.gemfile
- gemfiles/4.2.awsv1.gemfile
sudo: false sudo: false
cache: bundler cache: bundler
...@@ -7,8 +7,3 @@ appraise "4.2.awsv2.0" do ...@@ -7,8 +7,3 @@ appraise "4.2.awsv2.0" do
gem "rails", "~> 4.2.0" gem "rails", "~> 4.2.0"
gem "aws-sdk", "~> 2.0.0" gem "aws-sdk", "~> 2.0.0"
end end
appraise "4.2.awsv1" do
gem "rails", "~> 4.2.0"
gem "aws-sdk", "~> 1.5"
end
...@@ -561,7 +561,7 @@ Storage ...@@ -561,7 +561,7 @@ Storage
Paperclip ships with 3 storage adapters: Paperclip ships with 3 storage adapters:
* File Storage * File Storage
* S3 Storage (via `aws-sdk` or `aws-sdk-v1`) * S3 Storage (via `aws-sdk`)
* Fog Storage * Fog Storage
If you would like to use Paperclip with another storage, you can install these If you would like to use Paperclip with another storage, you can install these
...@@ -591,10 +591,6 @@ the `aws-sdk` gem in your Gemfile: ...@@ -591,10 +591,6 @@ the `aws-sdk` gem in your Gemfile:
```ruby ```ruby
gem 'aws-sdk', '>= 2.0.0' # If using paperclip `master` (upcoming v5.0) gem 'aws-sdk', '>= 2.0.0' # If using paperclip `master` (upcoming v5.0)
``` ```
or
```ruby
gem 'aws-sdk-v1' # If using paperclip <= v4.3.1
```
And then you can specify using S3 from `has_attached_file`. And then you can specify using S3 from `has_attached_file`.
You can find more information about configuring and using S3 storage in You can find more information about configuring and using S3 storage in
......
# This file was generated by Appraisal
source "https://rubygems.org"
gem "sqlite3", "~> 1.3.8", platforms: :ruby
gem "pry"
gem "rails", "~> 4.2.0"
gem "aws-sdk", "~> 1.5"
group :development, :test do
gem "activerecord-import"
gem "mime-types", "~> 1.16"
gem "builder"
gem "rubocop", :require => false
end
gemspec path: "../"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment