diff --git a/.travis.yml b/.travis.yml index 719fbadee..e8ffefadb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,9 @@ gemfile: - gemfiles/3.2.gemfile - gemfiles/4.1.gemfile - gemfiles/4.2.gemfile + - gemfiles/3.2.awsv1.gemfile + - gemfiles/4.1.awsv1.gemfile + - gemfiles/4.2.awsv1.gemfile matrix: fast_finish: true diff --git a/Appraisals b/Appraisals index 6b3be905f..16e6dd3f4 100644 --- a/Appraisals +++ b/Appraisals @@ -1,14 +1,35 @@ appraise "3.2" do gem "rails", "~> 3.2.0" + gem "aws-sdk", "~> 2.0" gem "paperclip", :path => "../" end appraise "4.1" do gem "rails", "~> 4.1.0" + gem "aws-sdk", "~> 2.0" gem "paperclip", :path => "../" end appraise "4.2" do gem "rails", "~> 4.2.0" + gem "aws-sdk", "~> 2.0" + gem "paperclip", :path => "../" +end + +appraise "3.2.awsv1" do + gem "rails", "~> 3.2.0" + gem "aws-sdk", "~> 1.5" + gem "paperclip", :path => "../" +end + +appraise "4.1.awsv1" do + gem "rails", "~> 4.1.0" + gem "aws-sdk", "~> 1.5" + gem "paperclip", :path => "../" +end + +appraise "4.2.awsv1" do + gem "rails", "~> 4.2.0" + gem "aws-sdk", "~> 1.5" gem "paperclip", :path => "../" end diff --git a/gemfiles/3.2.awsv1.gemfile b/gemfiles/3.2.awsv1.gemfile new file mode 100644 index 000000000..6eb0d83e0 --- /dev/null +++ b/gemfiles/3.2.awsv1.gemfile @@ -0,0 +1,21 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3", "~> 1.3.8", :platforms => :ruby +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rubysl", :platforms => :rbx +gem "racc", :platforms => :rbx +gem "pry" +gem "rails", "~> 3.2.15" +gem "paperclip", :path => "../" +gem "aws-sdk", "~> 1.5" + +group :development, :test do + gem "mime-types", "~> 1.16" + gem "builder" + gem "rubocop", :require => false +end + +gemspec :path => "../" diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile index 23e2a6cac..1b7af45a3 100644 --- a/gemfiles/3.2.gemfile +++ b/gemfiles/3.2.gemfile @@ -10,6 +10,7 @@ gem "racc", :platforms => :rbx gem "pry" gem "rails", "~> 3.2.15" gem "paperclip", :path => "../" +gem "aws-sdk", "~> 2.0" group :development, :test do gem "mime-types", "~> 1.16" diff --git a/gemfiles/4.1.awsv1.gemfile b/gemfiles/4.1.awsv1.gemfile new file mode 100644 index 000000000..6727ac1db --- /dev/null +++ b/gemfiles/4.1.awsv1.gemfile @@ -0,0 +1,21 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3", "~> 1.3.8", :platforms => :ruby +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rubysl", :platforms => :rbx +gem "racc", :platforms => :rbx +gem "pry" +gem "rails", "~> 4.1.0" +gem "paperclip", :path => "../" +gem "aws-sdk", "~> 1.5" + +group :development, :test do + gem "mime-types", "~> 1.16" + gem "builder" + gem "rubocop", :require => false +end + +gemspec :path => "../" diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile index e8dd0b6f7..38f9be44e 100644 --- a/gemfiles/4.1.gemfile +++ b/gemfiles/4.1.gemfile @@ -10,6 +10,7 @@ gem "racc", :platforms => :rbx gem "pry" gem "rails", "~> 4.1.0" gem "paperclip", :path => "../" +gem "aws-sdk", "~> 2.0" group :development, :test do gem "mime-types", "~> 1.16" diff --git a/gemfiles/4.2.awsv1.gemfile b/gemfiles/4.2.awsv1.gemfile new file mode 100644 index 000000000..efd33c38a --- /dev/null +++ b/gemfiles/4.2.awsv1.gemfile @@ -0,0 +1,21 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3", "~> 1.3.8", :platforms => :ruby +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rubysl", :platforms => :rbx +gem "racc", :platforms => :rbx +gem "pry" +gem "rails", "~> 4.2.0" +gem "paperclip", :path => "../" +gem "aws-sdk", "~> 1.5" + +group :development, :test do + gem "mime-types", "~> 1.16" + gem "builder" + gem "rubocop", :require => false +end + +gemspec :path => "../" diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index 3448e7ff3..f1180a1a7 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -10,6 +10,7 @@ gem "racc", :platforms => :rbx gem "pry" gem "rails", "~> 4.2.0" gem "paperclip", :path => "../" +gem "aws-sdk", "~> 2.0" group :development, :test do gem "mime-types", "~> 1.16"