Skip to content

Commit ef20ebd

Browse files
committed
Add support for carrierwave 1.3 and update travis build matrix
1 parent c7ad7c2 commit ef20ebd

6 files changed

+14
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ spec/public
88
Gemfile.lock
99
gemfiles/*.lock
1010
log/*
11+
.idea

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ language: ruby
88
cache: bundler
99
rvm:
1010
- 2.2.9
11-
- 2.3.7
12-
- 2.4.4
13-
- 2.5.1
11+
- 2.3.8
12+
- 2.4.5
13+
- 2.5.3
14+
- 2.6.0
1415

1516
gemfile:
1617
- Gemfile
1718
- gemfiles/carrierwave-0.10.gemfile
1819
- gemfiles/carrierwave-0.11.gemfile
1920
- gemfiles/carrierwave-1.1.gemfile
2021
- gemfiles/carrierwave-1.2.gemfile
22+
- gemfiles/carrierwave-1.3.gemfile
2123
- gemfiles/mongoid-3.gemfile
2224
- gemfiles/mongoid-4.gemfile
2325
- gemfiles/mongoid-5.gemfile

carrierwave-mongoid.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
2121
s.require_paths = ["lib"]
2222

23-
s.add_dependency "carrierwave", [">= 0.8", "< 1.3"]
23+
s.add_dependency "carrierwave", [">= 0.8", "< 1.4"]
2424
s.add_dependency "mongoid", [">= 3.0", "< 8.0"]
2525
s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
2626
s.add_dependency "mime-types", "< 3" if RUBY_VERSION < "2.0" # mime-types 3+ doesn't support ruby 1.9

gemfiles/carrierwave-1.3.gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source "https://rubygems.org"
2+
3+
gem "carrierwave", "~> 1.3.0"
4+
5+
gemspec path: "../"

gemfiles/mongoid-6.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

33
gem "mongoid", "~> 6.0"
4-
gem "carrierwave", "~> 1.2"
4+
gem "carrierwave", "~> 1.3"
55

66
gemspec path: "../"

gemfiles/mongoid-7.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

33
gem "mongoid", "~> 7.0"
4-
gem "carrierwave", "~> 1.2"
4+
gem "carrierwave", "~> 1.3"
55

66
gemspec path: "../"

0 commit comments

Comments
 (0)