diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54c18e0..9cc4d20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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' diff --git a/Appraisals b/Appraisals index 2600181..39d9819 100644 --- a/Appraisals +++ b/Appraisals @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index f07e1df..f968f2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/README.md b/README.md index 4bd7b6c..b4db2e5 100644 --- a/README.md +++ b/README.md @@ -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) を利用してください。 diff --git a/README_EN.md b/README_EN.md index 3d98e5c..0d05642 100644 --- a/README_EN.md +++ b/README_EN.md @@ -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). diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index a2fd77d..62b709b 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 5.0.0' +gem 'activerecord', '~> 5.0' gem 'sqlite3', '< 1.4' gemspec path: '../' diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile index 8e892b6..6da260e 100644 --- a/gemfiles/rails51.gemfile +++ b/gemfiles/rails51.gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 5.1.0' +gem 'activerecord', '~> 5.1' gem 'sqlite3', '< 1.4' gemspec path: '../' diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 1f1680f..abf988f 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 5.2.0' +gem 'activerecord', '~> 5.2' gem 'sqlite3', '< 1.4' gemspec path: '../' diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 24cd4fd..852b24f 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -4,6 +4,6 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 6.0.0' +gem 'activerecord', '~> 6.0' gemspec path: '../' diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index 8ee0e32..3e16a96 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -4,6 +4,6 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 6.1.0' +gem 'activerecord', '~> 6.1' gemspec path: '../' diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile new file mode 100644 index 0000000..cffa6d1 --- /dev/null +++ b/gemfiles/rails70.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'https://rubygems.org' + +gem 'activerecord', '~> 7.0' + +gemspec path: '../'