Skip to content

Commit eb5d376

Browse files
author
David Heinemeier Hansson
committed
Bump to Rails 4.2.0 as that's the most recently supported Rails version
This solves issues with json 1.8.3 not compiling against Ruby 2.4.1 etc.
1 parent 5207ff3 commit eb5d376

12 files changed

+19
-127
lines changed

Appraisals

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,3 @@
1-
appraise "rails-3-0" do
2-
gem "test-unit"
3-
gem "railties", "~> 3.0.0"
4-
gem "actionpack", "~> 3.0.0"
5-
gem "activemodel", "~> 3.0.0"
6-
end
7-
8-
appraise "rails-3-1" do
9-
gem "test-unit"
10-
gem "railties", "~> 3.1.0"
11-
gem "actionpack", "~> 3.1.0"
12-
gem "activemodel", "~> 3.1.0"
13-
end
14-
15-
appraise "rails-3-2" do
16-
gem "test-unit"
17-
gem "railties", "~> 3.2.0"
18-
gem "actionpack", "~> 3.2.0"
19-
gem "activemodel", "~> 3.2.0"
20-
end
21-
22-
appraise "rails-4-0" do
23-
gem "railties", "~> 4.0.0"
24-
gem "actionpack", "~> 4.0.0"
25-
gem "activemodel", "~> 4.0.0"
26-
end
27-
28-
appraise "rails-4-1" do
29-
gem "railties", "~> 4.1.0"
30-
gem "actionpack", "~> 4.1.0"
31-
gem "activemodel", "~> 4.1.0"
32-
end
33-
341
appraise "rails-4-2" do
352
gem "railties", "~> 4.2.0"
363
gem "actionpack", "~> 4.2.0"

Rakefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ else
1212

1313
test.libs << "test"
1414

15-
if Rails::VERSION::MAJOR == 3
16-
test.test_files = %w[test/jbuilder_template_test.rb test/jbuilder_test.rb]
17-
else
18-
test.test_files = FileList["test/*_test.rb"]
19-
end
15+
test.test_files = FileList["test/*_test.rb"]
2016
end
2117

2218
task default: :test

gemfiles/rails_3_0.gemfile

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

gemfiles/rails_3_1.gemfile

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

gemfiles/rails_3_2.gemfile

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

gemfiles/rails_4_0.gemfile

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

gemfiles/rails_4_1.gemfile

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

gemfiles/rails_4_2.gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
source "https://rubygems.org"
44

55
gem "rake"
6-
gem "mocha", :require => false
6+
gem "mocha", require: false
77
gem "appraisal"
88
gem "pry"
99
gem "railties", "~> 4.2.0"
1010
gem "actionpack", "~> 4.2.0"
1111
gem "activemodel", "~> 4.2.0"
12-
gem "nokogiri", "< 1.7" if RUBY_VERSION < "2.1"
1312

14-
gemspec :path => "../"
13+
gemspec path: "../"

gemfiles/rails_5_0.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
source "https://rubygems.org"
44

55
gem "rake"
6-
gem "mocha", :require => false
6+
gem "mocha", require: false
77
gem "appraisal"
88
gem "pry"
99
gem "railties", "~> 5.0.0"
1010
gem "actionpack", "~> 5.0.0"
1111
gem "activemodel", "~> 5.0.0"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"

gemfiles/rails_5_1.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
source "https://rubygems.org"
44

55
gem "rake"
6-
gem "mocha", :require => false
6+
gem "mocha", require: false
77
gem "appraisal"
88
gem "pry"
99
gem "railties", ">= 5.1.0", "< 5.2"
1010
gem "actionpack", ">= 5.1.0", "< 5.2"
1111
gem "activemodel", ">= 5.1.0", "< 5.2"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"

0 commit comments

Comments
 (0)