@@ -23,17 +23,31 @@ when /stable$/
23
23
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
24
24
25
25
gem_list.each do |rails_gem|
26
- gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
26
+ if version == '5-2-stable' && RUBY_VERSION < '2.3'
27
+ # Until 5-2-stable is fixed on Ruby 2.2, pin to last working version
28
+ gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => "v5.2.6"
29
+ else
30
+ gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
31
+ end
27
32
end
33
+
28
34
when nil, false, ""
29
35
add_net_gems_dependency # TODO: remove when we use switch to "~> 7.0.0" that declares dependency on those gems on itself
30
36
gem "rails", "~> 6.0.0"
31
37
gem "puma"
32
38
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
33
39
gem 'selenium-webdriver', require: false
34
40
else
35
- add_net_gems_dependency if version.split(' ').last < '7.0'
41
+ rails_version = version.split(' ').last
42
+
43
+ add_net_gems_dependency if rails_version < '7.0'
44
+
36
45
gem "rails", version
46
+
47
+ if rails_version < '6.0' && RUBY_VERSION < '2.3'
48
+ gem "activesupport", "~> 5.2", "!= 5.2.6.1", "!= 5.2.6.2"
49
+ end
50
+
37
51
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5'
38
52
gem "puma"
39
53
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
0 commit comments