Skip to content

Commit 318ae5b

Browse files
authored
Merge pull request #866 from reactjs/drop-unsupported-versions
chore: 🔥 Remove unsupported ruby and rails versions
2 parents aedd2ee + 3b5a5a2 commit 318ae5b

File tree

7 files changed

+4
-113
lines changed

7 files changed

+4
-113
lines changed

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
AllCops:
2-
TargetRubyVersion: 2.1
2+
TargetRubyVersion: 2.3
33
DisplayCopNames: true
44
Exclude:
55
- test/dummy_sprockets/**/*
66
- test/dummy_webpacker1/**/*
77
- test/dummy_webpacker2/**/*
88
- test/dummy_webpacker3/**/*
99
- node_modules/**/*
10-
- react_ujs/**/*
10+
- react_ujs/**/*

.travis.yml

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cache:
99
rvm:
1010
- 2.5.0
1111
- 2.3.0
12-
- 2.1
1312
- jruby-9.1.9.0
1413

1514
gemfile:
@@ -20,10 +19,6 @@ gemfile:
2019
- gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
2120
- gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
2221
# These don't have webpacker:
23-
- gemfiles/rails_3.2.gemfile
24-
- gemfiles/rails_4.0.5.gemfile
25-
- gemfiles/rails_4.0_with_mini_racer.gemfile
26-
- gemfiles/rails_4.1.gemfile
2722
- gemfiles/rails_4.2_sprockets_2.gemfile
2823
- gemfiles/rails_4.2_sprockets_3.gemfile
2924
- gemfiles/rails_5_no_sprockets.gemfile
@@ -32,40 +27,8 @@ gemfile:
3227
matrix:
3328
fast_finish: true
3429
exclude:
35-
- rvm: 2.5.0
36-
gemfile: gemfiles/rails_3.2.gemfile
37-
- rvm: 2.5.0
38-
gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
39-
- rvm: 2.5.0
40-
gemfile: gemfiles/rails_4.0.5.gemfile
41-
- rvm: 2.5.0
42-
gemfile: gemfiles/rails_4.1.gemfile
43-
# all except rails_4.1 skipped on 2.1
44-
- rvm: 2.1
45-
gemfile: gemfiles/rails_3.2.gemfile
46-
- rvm: 2.1
47-
gemfile: gemfiles/rails_4.0.5.gemfile
48-
- rvm: 2.1
49-
gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
50-
- rvm: 2.1
51-
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
52-
- rvm: 2.1
53-
gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
54-
- rvm: 2.1
55-
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
56-
- rvm: 2.1
57-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
58-
- rvm: 2.1
59-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
60-
- rvm: 2.1
61-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
62-
- rvm: 2.1
63-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
64-
- rvm: 2.1
65-
gemfile: gemfiles/rails_5_no_sprockets.gemfile
66-
- rvm: 2.1
67-
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
68-
# all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3, and 3.2 skipped on jruby
30+
31+
# all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3
6932
- rvm: jruby-9.1.9.0
7033
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
7134
- rvm: jruby-9.1.9.0
@@ -74,12 +37,6 @@ matrix:
7437
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
7538
- rvm: jruby-9.1.9.0
7639
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
77-
- rvm: jruby-9.1.9.0
78-
gemfile: gemfiles/rails_4.0.5.gemfile
79-
- rvm: jruby-9.1.9.0
80-
gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
81-
- rvm: jruby-9.1.9.0
82-
gemfile: gemfiles/rails_4.1.gemfile
8340
- rvm: jruby-9.1.9.0
8441
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
8542
- rvm: jruby-9.1.9.0

Appraisals

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,3 @@ appraise 'rails-4.2-sprockets_2' do
7070
gem 'sprockets', '~> 2.12'
7171
gem 'turbolinks'
7272
end
73-
74-
appraise 'rails-4.1' do
75-
gem 'rails', '~> 4.1.10'
76-
# Just to make sure we support old Turbolinks:
77-
gem 'turbolinks', '~> 2.3.0'
78-
end
79-
80-
appraise 'rails-4.0-with-mini_racer' do
81-
gem 'rails', '~> 4.0.13'
82-
gem 'mini_racer', :platforms => :mri
83-
gem 'therubyrhino', :platforms => :jruby
84-
gem 'turbolinks'
85-
end
86-
87-
appraise 'rails-4.0.5' do
88-
# Depends on sprockets-rails ~> 2.0.0. Support for
89-
# `Rails.application.assets_manifest` which is used by
90-
# `ServerRendering::ManifestContainer` has only been added in
91-
# sprockets-rails 2.2.2. Ensure that server rendering falls back to
92-
# `ServerRendering::EnvironmentContainer`.`
93-
gem 'rails', '4.0.5'
94-
gem 'turbolinks'
95-
end
96-
97-
appraise 'rails-3.2' do
98-
gem 'rails', '~> 3.2.21'
99-
gem 'rack-cache', '~> 1.6.1'
100-
# Modern turbolinks depends on `Rails.application.assets` which no-worky
101-
gem 'turbolinks', '~> 2.0'
102-
end
103-

gemfiles/rails_3.2.gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

gemfiles/rails_4.0.5.gemfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

gemfiles/rails_4.0_with_mini_racer.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

gemfiles/rails_4.1.gemfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)