Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Rails 7.0 #55

Merged
merged 1 commit into from
Jan 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,22 @@ jobs:
- rails52.gemfile
- rails60.gemfile
- rails61.gemfile
- rails70.gemfile
exclude:
- ruby: '2.4'
gemfile: rails60.gemfile
- ruby: '2.4'
gemfile: rails61.gemfile
- ruby: '2.4'
gemfile: rails70.gemfile
- ruby: '2.5'
gemfile: rails60.gemfile
- ruby: '2.5'
gemfile: rails61.gemfile
- ruby: '2.5'
gemfile: rails70.gemfile
- ruby: '2.6'
gemfile: rails70.gemfile
- ruby: '3.0'
gemfile: rails50.gemfile
- ruby: '3.0'
Expand Down
16 changes: 11 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
# frozen_string_literal: true

appraise 'rails50' do
gem 'activerecord', '~> 5.0.0'
gem 'activerecord', '~> 5.0'
gem 'sqlite3', '< 1.4'
end

appraise 'rails51' do
gem 'activerecord', '~> 5.1.0'
gem 'activerecord', '~> 5.1'
gem 'sqlite3', '< 1.4'
end

appraise 'rails52' do
gem 'activerecord', '~> 5.2.0'
gem 'activerecord', '~> 5.2'
gem 'sqlite3', '< 1.4'
end

if RUBY_VERSION >= '2.6.0'
appraise 'rails60' do
gem 'activerecord', '~> 6.0.0'
gem 'activerecord', '~> 6.0'
end

appraise 'rails61' do
gem 'activerecord', '~> 6.1.0'
gem 'activerecord', '~> 6.1'
end
end

if RUBY_VERSION >= '2.7.0'
appraise 'rails70' do
gem 'activerecord', '~> 7.0'
end
end
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Features

* Ruby 3.1 をサポートに追加 (PR [#54](https://github.com/chocoby/jp_prefecture/pull/54)/[@chocoby](https://github.com/chocoby))
* Rails 7.0 をサポート (PR [#55](https://github.com/chocoby/jp_prefecture/pull/55)/[@chocoby](https://github.com/chocoby))

## 1.0.0 (2021-02-24)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ $ gem install jp_prefecture
## サポートしているバージョン

* Ruby: 2.4 - 3.1
* Rails: 5.0 - 6.1
* Rails: 5.0 - 7.0

これより古い Ruby/Rails バージョンを使用する場合は、[`v0.11.0`](https://github.com/chocoby/jp_prefecture/tree/0.x) を利用してください。

Expand Down
2 changes: 1 addition & 1 deletion README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ $ gem install jp_prefecture
## Supported versions

* Ruby: 2.4 - 3.1
* Rails: 5.0 - 6.1
* Rails: 5.0 - 7.0

If you are using an older Ruby/Rails version, please use [`v0.11.0`](https://github.com/chocoby/jp_prefecture/tree/0.x).

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'activerecord', '~> 5.0.0'
gem 'activerecord', '~> 5.0'
gem 'sqlite3', '< 1.4'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails51.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'activerecord', '~> 5.1.0'
gem 'activerecord', '~> 5.1'
gem 'sqlite3', '< 1.4'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'activerecord', '~> 5.2.0'
gem 'activerecord', '~> 5.2'
gem 'sqlite3', '< 1.4'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails60.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

source 'https://rubygems.org'

gem 'activerecord', '~> 6.0.0'
gem 'activerecord', '~> 6.0'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails61.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

source 'https://rubygems.org'

gem 'activerecord', '~> 6.1.0'
gem 'activerecord', '~> 6.1'

gemspec path: '../'
9 changes: 9 additions & 0 deletions gemfiles/rails70.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'https://rubygems.org'

gem 'activerecord', '~> 7.0'

gemspec path: '../'