Skip to content

Commit

Permalink
Update to rails 6.0.0 (#597)
Browse files Browse the repository at this point in the history
update to Rails 6.0.0
  • Loading branch information
coorasse committed Aug 22, 2019
1 parent b2e5660 commit 24f3b54
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ rvm:
- 2.3.5
- 2.4.2
- 2.5.1
- 2.6.0
- 2.6.3
- ruby-head
- jruby-9.1.9.0
- jruby-9.2.5.0
- jruby-9.1.17.0
- jruby-9.2.7.0
- jruby-head

gemfile:
Expand All @@ -32,13 +32,13 @@ matrix:
gemfile: gemfiles/activerecord_6.0.0.gemfile
- rvm: 2.4.2
gemfile: gemfiles/activerecord_6.0.0.gemfile
- rvm: jruby-9.1.9.0
- rvm: jruby-9.1.17.0
gemfile: gemfiles/activerecord_5.0.2.gemfile
- rvm: jruby-9.1.9.0
- rvm: jruby-9.1.17.0
gemfile: gemfiles/activerecord_6.0.0.gemfile
- rvm: jruby-9.2.5.0
- rvm: jruby-9.2.7.0
gemfile: gemfiles/activerecord_5.0.2.gemfile
- rvm: jruby-9.2.5.0
- rvm: jruby-9.2.7.0
gemfile: gemfiles/activerecord_6.0.0.gemfile
allow_failures:
- rvm: ruby-head
Expand All @@ -51,6 +51,7 @@ notifications:
on_success: change
on_failure: change
before_install:
- rvm get stable
- gem update --system
- gem install bundler
script:
Expand Down
8 changes: 4 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ appraise 'activerecord_5.2.2' do
end

appraise 'activerecord_6.0.0' do
gem 'actionpack', '~> 6.0.0.beta3', require: 'action_pack'
gem 'activerecord', '~> 6.0.0.beta3', require: 'active_record'
gem 'activesupport', '~> 6.0.0.beta3', require: 'active_support/all'
gem 'actionpack', '~> 6.0.0', require: 'action_pack'
gem 'activerecord', '~> 6.0.0', require: 'active_record'
gem 'activesupport', '~> 6.0.0', require: 'active_support/all'

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
Expand All @@ -80,6 +80,6 @@ appraise 'activerecord_6.0.0' do

platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.1.4'
gem 'sqlite3', '~> 1.3.0'
gem 'sqlite3', '~> 1.4.0'
end
end
8 changes: 4 additions & 4 deletions gemfiles/activerecord_6.0.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

source "https://rubygems.org"

gem "actionpack", "~> 6.0.0.beta3", require: "action_pack"
gem "activerecord", "~> 6.0.0.beta3", require: "active_record"
gem "activesupport", "~> 6.0.0.beta3", require: "active_support/all"
gem "actionpack", "~> 6.0.0", require: "action_pack"
gem "activerecord", "~> 6.0.0", require: "active_record"
gem "activesupport", "~> 6.0.0", require: "active_support/all"

platforms :jruby do
gem "activerecord-jdbcsqlite3-adapter"
Expand All @@ -14,7 +14,7 @@ end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.1.4"
gem "sqlite3", "~> 1.3.0"
gem "sqlite3", "~> 1.4.0"
end

gemspec path: "../"

0 comments on commit 24f3b54

Please sign in to comment.