File tree 6 files changed +40
-7
lines changed
6 files changed +40
-7
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ matrix:
31
31
32
32
- rvm : 2.6.1
33
33
jdk : oraclejdk8
34
- env : RAILS_VERSIONS=4.0,5.0
34
+ env : RAILS_VERSIONS=4.0,5.0,6.0
35
35
36
36
- rvm : jruby-9.2.5.0
37
37
jdk : oraclejdk8
Original file line number Diff line number Diff line change @@ -16,6 +16,4 @@ test/tmp
16
16
test /version_tmp
17
17
tmp
18
18
19
- gemfiles /3.0.gemfile.lock
20
- gemfiles /4.0.gemfile.lock
21
- gemfiles /5.0.gemfile.lock
19
+ gemfiles /* .gemfile.lock
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ task :test => 'test:unit'
24
24
if RUBY_VERSION < '2.3'
25
25
GEMFILES = [ '3.0.gemfile' , '4.0.gemfile' , '5.0.gemfile' ]
26
26
else
27
- GEMFILES = [ '4.0.gemfile' , '5.0.gemfile' ]
27
+ GEMFILES = [ '4.0.gemfile' , '5.0.gemfile' , '6.0.gemfile' ]
28
28
end
29
29
30
30
namespace :bundle do
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ gemspec path: '../'
27
27
gem 'activemodel', '>= 3.0'
28
28
gem 'activerecord', '~> 3.2'
29
29
gem 'mongoid', '>= 3.0'
30
- gem 'sqlite3' unless defined?(JRUBY_VERSION)
30
+ gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
31
31
32
32
group :development, :testing do
33
33
gem 'rspec'
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ gemspec path: '../'
26
26
27
27
gem 'activemodel', '~> 4'
28
28
gem 'activerecord', '~> 4'
29
- gem 'sqlite3' unless defined?(JRUBY_VERSION)
29
+ gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
30
30
gem 'mongoid', '~> 5'
31
31
32
32
group :development, :testing do
Original file line number Diff line number Diff line change
1
+ # Licensed to Elasticsearch B.V. under one or more contributor
2
+ # license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright
4
+ # ownership. Elasticsearch B.V. licenses this file to you under
5
+ # the Apache License, Version 2.0 (the "License"); you may
6
+ # not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing,
12
+ # software distributed under the License is distributed on an
13
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14
+ # KIND, either express or implied. See the License for the
15
+ # specific language governing permissions and limitations
16
+ # under the License.
17
+
18
+ # Usage:
19
+ #
20
+ # $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
21
+ # $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
22
+
23
+ source 'https://rubygems.org'
24
+
25
+ gemspec path: '../'
26
+
27
+ gem 'activemodel', '6.0.0.rc1'
28
+ gem 'activerecord', '6.0.0.rc1'
29
+ gem 'sqlite3' unless defined?(JRUBY_VERSION)
30
+ gem 'mongoid', '~> 6'
31
+
32
+ group :development, :testing do
33
+ gem 'rspec'
34
+ gem 'pry-nav'
35
+ end
You can’t perform that action at this time.
0 commit comments