Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fc36085

Browse files
Bump JRuby to 9.1.9.0 according to http://rubies.travis-ci.org/. Also scope rubyracer to MRI and replace with rubyrhino on JRuby
1 parent 1bd3565 commit fc36085

15 files changed

+46
-36
lines changed

‎.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cache:
77
rvm:
88
- 2.3.0
99
- 2.1
10-
- jruby-9.0.1.0
10+
- jruby-9.1.9.0
1111

1212
gemfile:
1313
# These have webpacker:
@@ -53,27 +53,27 @@ matrix:
5353
gemfile: gemfiles/rails_5_no_sprockets.gemfile
5454
- rvm: 2.1
5555
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
56-
- rvm: jruby-9.0.1.0
56+
- rvm: jruby-9.1.9.0
5757
gemfile: gemfiles/rails_4.0.gemfile
58-
- rvm: jruby-9.0.1.0
58+
- rvm: jruby-9.1.9.0
5959
gemfile: rails_4.0_with_therubyracer.gemfile
60-
- rvm: jruby-9.0.1.0
60+
- rvm: jruby-9.1.9.0
6161
gemfile: gemfiles/rails_4.1.gemfile
62-
- rvm: jruby-9.0.1.0
62+
- rvm: jruby-9.1.9.0
6363
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
64-
- rvm: jruby-9.0.1.0
64+
- rvm: jruby-9.1.9.0
6565
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
66-
- rvm: jruby-9.0.1.0
66+
- rvm: jruby-9.1.9.0
6767
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
68-
- rvm: jruby-9.0.1.0
68+
- rvm: jruby-9.1.9.0
6969
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
70-
- rvm: jruby-9.0.1.0
70+
- rvm: jruby-9.1.9.0
7171
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
72-
- rvm: jruby-9.0.1.0
72+
- rvm: jruby-9.1.9.0
7373
gemfile: gemfiles/rails_5_no_sprockets.gemfile
7474

7575
allow_failures:
76-
- rvm: jruby-9.0.1.0
76+
- rvm: jruby-9.1.9.0
7777

7878
before_install:
7979
- nvm install 7.8.0 && nvm use 7.8.0

‎Appraisals

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ end
1717

1818
appraise 'rails-4.0-with-therubyracer' do
1919
gem 'rails', '~> 4.0.13'
20-
gem 'therubyracer', '0.12.0', :platform => :mri
20+
gem 'therubyracer', '0.12.0', :platforms => :mri
2121
gem 'turbolinks'
2222
end
2323

@@ -45,7 +45,8 @@ appraise 'rails-4.2-sprockets_4' do
4545
gem 'turbolinks', '~> 2.5.0'
4646
# This ExecJS backend provides stateful context
4747
# which the default nodejs backend does not
48-
gem 'mini_racer'
48+
gem 'mini_racer', :platforms => :mri
49+
gem 'therubyrhino', :platforms => :jruby
4950
end
5051

5152
# no_sprockets is a magical name from sprockets_helper.rb in test to
@@ -55,31 +56,35 @@ appraise 'rails-5_no_sprockets_webpacker_1_1' do
5556
gem 'webpacker', '~> 1.1.0'
5657
# This ExecJS backend provides stateful context
5758
# which the default nodejs backend does not
58-
gem 'therubyracer'
59+
gem 'therubyracer', :platforms => :mri
60+
gem 'therubyrhino', :platforms => :jruby
5961
end
6062

6163
appraise 'rails-5_no_sprockets_webpacker_1_x' do
6264
gem 'rails', '~> 5.0.0'
6365
gem 'webpacker', '~> 1.2'
6466
# This ExecJS backend provides stateful context
6567
# which the default nodejs backend does not
66-
gem 'therubyracer'
68+
gem 'therubyracer', :platforms => :mri
69+
gem 'therubyrhino', :platforms => :jruby
6770
end
6871

6972
appraise 'rails-5_no_sprockets_webpacker_2' do
7073
gem 'rails', '~> 5.0.0'
7174
gem 'webpacker', '~> 2.0'
7275
# This ExecJS backend provides stateful context
7376
# which the default nodejs backend does not
74-
gem 'therubyracer'
77+
gem 'therubyracer', :platforms => :mri
78+
gem 'therubyrhino', :platforms => :jruby
7579
end
7680

7781
appraise 'rails-5_no_sprockets_webpacker_3' do
7882
gem 'rails', '~> 5.0.0'
7983
gem 'webpacker', '>= 3.0'
8084
# This ExecJS backend provides stateful context
8185
# which the default nodejs backend does not
82-
gem 'therubyracer'
86+
gem 'therubyracer', :platforms => :mri
87+
gem 'therubyrhino', :platforms => :jruby
8388
end
8489

8590
appraise 'rails-5-no_sprockets' do

‎gemfiles/rails_3.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 3.2.21"
66
gem "rack-cache", "~> 1.6.1"
77
gem "turbolinks", "~> 2.0"
88

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

‎gemfiles/rails_4.0.5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source "http://rubygems.org"
55
gem "rails", "4.0.5"
66
gem "turbolinks"
77

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

‎gemfiles/rails_4.0_with_therubyracer.gemfile

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

55
gem "rails", "~> 4.0.13"
6-
gem "therubyracer", "0.12.0", :platform => :mri
6+
gem "therubyracer", "0.12.0", platforms: :mri
77
gem "turbolinks"
88

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

‎gemfiles/rails_4.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source "http://rubygems.org"
55
gem "rails", "~> 4.1.10"
66
gem "turbolinks", "~> 2.3.0"
77

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

‎gemfiles/rails_4.2_sprockets_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 2.12"
77
gem "turbolinks"
88

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

‎gemfiles/rails_4.2_sprockets_3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 3.5"
77
gem "turbolinks", "~> 2.5.0"
88

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

‎gemfiles/rails_4.2_sprockets_4.gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ source "http://rubygems.org"
55
gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 4.0.x"
77
gem "turbolinks", "~> 2.5.0"
8-
gem "mini_racer"
8+
gem "mini_racer", platforms: :mri
9+
gem "therubyrhino", platforms: :jruby
910

10-
gemspec :path => "../"
11+
gemspec path: "../"

‎gemfiles/rails_5.1_sprockets_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 5.1"
66
gem "sprockets", "~> 4.0.x"
77
gem "turbolinks", "~> 5.0.0"
88

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

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /