Skip to content

Commit ed43400

Browse files
Sam Phippenbenoittgt
authored andcommitted
Add Changelog and explicit jruby support for 5.2
1 parent 17d239b commit ed43400

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ matrix:
4848
env: RAILS_VERSION=6-0-stable
4949

5050
# Rails 5.2 builds >= 2.2.2
51+
- rvm: jruby-head
52+
env:
53+
- RAILS_VERSION=6-0-stable
54+
- JRUBY_OPT=--dev
5155
- rvm: 2.6.3
5256
env: RAILS_VERSION='~> 5.2.0'
5357
- rvm: 2.5.3

Gemfile-rails-dependencies

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,26 @@ when /master/
1313
gem 'sprockets', :git => 'https://github.com/rails/sprockets.git', :branch => 'master'
1414
gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git', :branch => 'master'
1515
gem 'puma', "3.12.1"
16+
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
1617
when /stable$/
1718
gem_list = %w[rails railties actionmailer actionpack activerecord activesupport]
1819
gem_list << 'activejob' if version >= '4-2-stable'
1920
gem_list << 'actionview' if version >= '4-2-stable'
2021
gem 'puma', "3.12.1" if version > '5-0-stable'
22+
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
2123

2224
gem_list.each do |rails_gem|
2325
gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
2426
end
2527
when nil, false, ""
2628
gem "rails", "~> 5.0.0"
29+
gem 'activerecord-jdbcsqlite3-adapter'
2730
else
2831
gem "rails", version
2932

3033
if version >= '5-1-stable' && RUBY_VERSION >= "2.3"
3134
gem "puma"
3235
end
36+
gem 'activerecord-jdbcsqlite3-adapter'
3337
end
3438

35-
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
36-

0 commit comments

Comments
 (0)