Skip to content

Commit dd24780

Browse files
committed
Drop support for Ruby < 2.2, Rubinius and Rails 4.x
1 parent 12d009d commit dd24780

File tree

79 files changed

+125
-528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+125
-528
lines changed

.travis.yml

+5-20
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@ env:
2323
- JRUBY_OPTS="$JRUBY_OPTS --debug"
2424

2525
rvm:
26-
- 2.3.8
26+
- 2.6.3
2727

2828
gemfile:
29-
- gemfiles/rails_4.0.gemfile
30-
- gemfiles/rails_4.1.gemfile
31-
- gemfiles/rails_4.2.gemfile
3229
- gemfiles/rails_5.0.gemfile
3330
- gemfiles/rails_5.1.gemfile
3431
- gemfiles/rails_5.2.gemfile
@@ -38,16 +35,8 @@ services:
3835

3936
dist: trusty
4037

41-
sudo: false
42-
4338
matrix:
4439
include:
45-
- rvm: 2.1.10
46-
env: CI_ORM=mongoid
47-
gemfile: gemfiles/rails_4.2.gemfile
48-
- rvm: 2.1.10
49-
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
50-
gemfile: gemfiles/rails_4.2.gemfile
5140
- rvm: 2.2.10
5241
env: CI_ORM=mongoid
5342
gemfile: gemfiles/rails_5.2.gemfile
@@ -75,10 +64,10 @@ matrix:
7564
- rvm: 2.5.3
7665
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
7766
gemfile: gemfiles/rails_5.2.gemfile
78-
- rvm: 2.6.1
67+
- rvm: 2.6.3
7968
env: CI_ORM=mongoid
8069
gemfile: gemfiles/rails_5.2.gemfile
81-
- rvm: 2.6.1
70+
- rvm: 2.6.3
8271
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
8372
gemfile: gemfiles/rails_5.2.gemfile
8473
- rvm: ruby-head
@@ -87,21 +76,17 @@ matrix:
8776
- rvm: ruby-head
8877
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
8978
gemfile: gemfiles/rails_5.2.gemfile
90-
- rvm: rbx-2.2.7
91-
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
92-
gemfile: gemfiles/rails_4.2.gemfile
93-
- rvm: jruby-9.2.5.0
79+
- rvm: jruby-9.2.6.0
9480
env: CI_ORM=mongoid
9581
gemfile: gemfiles/rails_5.2.gemfile
96-
- rvm: jruby-9.2.5.0
82+
- rvm: jruby-9.2.6.0
9783
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
9884
gemfile: gemfiles/rails_5.2.gemfile
9985
- rvm: jruby-head
10086
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
10187
gemfile: gemfiles/rails_5.2.gemfile
10288
allow_failures:
10389
- rvm: ruby-head
104-
- rvm: rbx-2.2.7
10590
- rvm: jruby-head
10691
fast_finish: true
10792

Appraisals

-103
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,3 @@
1-
appraise "rails-4.0" do
2-
gem 'rails', '~> 4.0.0'
3-
gem 'sass-rails', '~> 4.0.3'
4-
gem 'devise', '>= 3.2'
5-
gem 'test-unit'
6-
gem 'capybara', '>= 0.8', group: :test
7-
gem 'kaminari', '~> 0.14'
8-
9-
group :test do
10-
gem 'cancancan', '~> 1.12'
11-
end
12-
13-
group :active_record do
14-
gem 'paper_trail', '~> 5.0'
15-
16-
platforms :jruby do
17-
gem 'activerecord-jdbcmysql-adapter', '~> 1.2'
18-
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.2'
19-
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0.beta1'
20-
end
21-
end
22-
23-
group :mongoid do
24-
gem 'mongoid', '~> 5.0'
25-
gem 'kaminari-mongoid', '~> 0.1'
26-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
27-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
28-
gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: :ruby
29-
end
30-
31-
platforms :ruby do
32-
gem 'refile', '~> 0.5', require: 'refile/rails'
33-
gem 'refile-mini_magick', '>= 0.1.0'
34-
end
35-
end
36-
37-
appraise "rails-4.1" do
38-
gem 'rails', '~> 4.1.0'
39-
gem 'devise', '>= 3.2'
40-
gem 'capybara', '>= 0.8', group: :test
41-
42-
group :test do
43-
gem 'cancancan', '~> 1.12'
44-
end
45-
46-
group :active_record do
47-
gem 'paper_trail', '>= 5.0'
48-
49-
platforms :jruby do
50-
gem 'activerecord-jdbcmysql-adapter', '~> 1.2'
51-
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.2'
52-
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0.beta1'
53-
end
54-
end
55-
56-
group :mongoid do
57-
gem 'mongoid', '~> 5.0'
58-
gem 'kaminari-mongoid'
59-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
60-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
61-
gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: :ruby
62-
end
63-
64-
platforms :ruby do
65-
gem 'refile', '~> 0.5', require: 'refile/rails'
66-
gem 'refile-mini_magick', '>= 0.1.0'
67-
end
68-
end
69-
70-
appraise "rails-4.2" do
71-
gem 'rails', '~> 4.2.0'
72-
gem 'sass-rails', '~> 5.0'
73-
gem 'devise', '>= 3.4'
74-
gem 'capybara', '>= 0.8', group: :test
75-
76-
group :test do
77-
gem 'cancancan', '~> 1.12'
78-
end
79-
80-
group :active_record do
81-
gem 'paper_trail', '>= 5.0'
82-
83-
platforms :jruby do
84-
gem 'activerecord-jdbcmysql-adapter', '~> 1.2'
85-
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.2'
86-
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0.beta1'
87-
end
88-
end
89-
90-
group :mongoid do
91-
gem 'mongoid', '~> 5.0'
92-
gem 'kaminari-mongoid'
93-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
94-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
95-
gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: :ruby
96-
end
97-
98-
platforms :ruby do
99-
gem 'refile', '~> 0.5', require: 'refile/rails'
100-
gem 'refile-mini_magick', '>= 0.1.0'
101-
end
102-
end
103-
1041
appraise "rails-5.0" do
1052
gem 'rails', '~> 5.0.0'
1063
gem 'sass-rails', '~> 5.0'

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ group :test do
3232
gem 'pundit'
3333
gem 'rack-cache', require: 'rack/cache'
3434
gem 'rspec-rails', '>= 2.14'
35+
gem 'rspec-expectations', '!= 3.8.3'
3536
gem 'rubocop', '~> 0.41.2'
3637
gem 'simplecov', '>= 0.9', require: false
3738
gem 'timecop', '>= 0.5'

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,11 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi
9696
## Supported Ruby Versions
9797
This library aims to support and is [tested against][travis] the following Ruby implementations:
9898

99-
* Ruby 2.1
10099
* Ruby 2.2
101100
* Ruby 2.3
102101
* Ruby 2.4
103102
* Ruby 2.5
104-
* [Rubinius][]
103+
* Ruby 2.6
105104
* [JRuby][]
106105

107-
[rubinius]: http://rubinius.com
108106
[jruby]: http://jruby.org/

gemfiles/cancan.gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ group :test do
3535
gem "pundit"
3636
gem "rack-cache", require: "rack/cache"
3737
gem "rspec-rails", ">= 2.14"
38+
gem "rspec-expectations", "!= 3.8.3"
3839
gem "rubocop", "~> 0.41.2"
3940
gem "simplecov", ">= 0.9", require: false
4041
gem "timecop", ">= 0.5"

gemfiles/rails_4.0.gemfile

-70
This file was deleted.

gemfiles/rails_4.1.gemfile

-67
This file was deleted.

0 commit comments

Comments
 (0)