Updated CI config to better focus on carrierwave 1.0 support

rmm5t · rmm5t · commit eb015492d777 · 2017-01-12T18:28:39.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,27 +7,17 @@ notifications:
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-  - jruby-19mode
+  - 2.2.6
+  - 2.3.3
 
 gemfile:
   - Gemfile
-  - gemfiles/carrierwave-0.9.gemfile
   - gemfiles/carrierwave-0.10.gemfile
-  - gemfiles/carrierwave-1.0.gemfile
-  - gemfiles/carrierwave-master.gemfile
+  - gemfiles/carrierwave-0.11.gemfile
   - gemfiles/mongoid-3.1.gemfile
   - gemfiles/mongoid-4.0.gemfile
   - gemfiles/mongoid-5.0.gemfile
+  - gemfiles/mongoid-6.0.gemfile
 
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/carrierwave-master.gemfile
   fast_finish: true
-  include:
-    - rvm: 2.2.5
-      gemfile: gemfiles/mongoid-6.0.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/mongoid-6.0.gemfile
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,4 @@
 source "http://rubygems.org"
 
-group :development, :test do
-  gem 'json', :platforms => [:jruby]
-end
-
 # Specify your gem's dependencies in carrierwave-mongoid.gemspec
 gemspec
diff --git a/carrierwave-mongoid.gemspec b/carrierwave-mongoid.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "carrierwave", ">= 0.8.0"
+  s.add_dependency "carrierwave", [">= 0.8", "< 1.1"]
   s.add_dependency "mongoid", [">= 3.0", "< 7.0"]
   s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
   s.add_dependency "mime-types", "< 3" if RUBY_VERSION < "2.0" # mime-types 3+ doesn't support ruby 1.9
diff --git a/gemfiles/carrierwave-0.11.gemfile b/gemfiles/carrierwave-0.11.gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "carrierwave", "~> 0.9.0"
+gem "carrierwave", "~> 0.11.0"
 
 gemspec path: "../"
diff --git a/gemfiles/carrierwave-1.0.gemfile b/gemfiles/carrierwave-1.0.gemfile
diff --git a/gemfiles/carrierwave-master.gemfile b/gemfiles/carrierwave-master.gemfile
diff --git a/gemfiles/mongoid-4.0.gemfile b/gemfiles/mongoid-4.0.gemfile
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 4.0.0"
+gem "carrierwave", "~> 0.11.0"
 
 gemspec path: "../"
diff --git a/gemfiles/mongoid-5.0.gemfile b/gemfiles/mongoid-5.0.gemfile
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 5.0.0"
+gem "carrierwave", "~> 0.11.0"
 
 gemspec path: "../"
diff --git a/gemfiles/mongoid-6.0.gemfile b/gemfiles/mongoid-6.0.gemfile
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 6.0.0.beta"
+gem "carrierwave", "~> 0.11.0"
 
 gemspec path: "../"
