Skip to content

Commit

Permalink
Merge pull request #39 from chocoby/issue26-versions
Browse files Browse the repository at this point in the history
Organize supported Ruby and Rails versions
  • Loading branch information
chocoby committed Dec 26, 2020
2 parents 9f03ab0 + 54100d7 commit 640f68e
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 68 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- 2.6
- 2.7
gemfile:
- rails42.gemfile
- rails50.gemfile
- rails51.gemfile
- rails52.gemfile
Expand All @@ -34,8 +33,6 @@ jobs:
gemfile: rails60.gemfile
- ruby: 2.5
gemfile: rails61.gemfile
- ruby: 2.7
gemfile: rails42.gemfile

env:
CI: true
Expand Down
34 changes: 6 additions & 28 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,40 +1,18 @@
appraise 'rails32' do
gem 'activerecord', '~> 3.2.0'
appraise 'rails50' do
gem 'activerecord', '~> 5.0.0'
gem 'sqlite3', '< 1.4'
end

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

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

appraise 'rails42' do
gem 'activerecord', '~> 4.2.0'
gem 'sqlite3', '< 1.4'
end

if RUBY_VERSION >= '2.2.2'
appraise 'rails50' do
gem 'activerecord', '~> 5.0.0'
gem 'sqlite3', '< 1.4'
end

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

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

if RUBY_VERSION >= '2.6.0'
appraise 'rails60' do
gem 'activerecord', '~> 6.0.0'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ $ gem install jp_prefecture

## サポートしているバージョン

* Ruby: 1.9.3 / 2.0 / 2.1 / 2.2 / 2.3 / 2.4 / 2.5 / 2.6 / 2.7
* Rails: 3.2 / 4.0 / 4.1 / 4.2 / 5.0 / 5.1 / 5.2 / 6.0 / 6.1
* Ruby: 2.4 / 2.5 / 2.6 / 2.7
* Rails: 5.0 / 5.1 / 5.2 / 6.0 / 6.1


## Contributing
Expand Down
4 changes: 2 additions & 2 deletions README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ $ gem install jp_prefecture

## Supports

* Ruby: 1.9.3 / 2.0 / 2.1 / 2.2 / 2.3 / 2.4 / 2.5 / 2.6 / 2.7
* Rails: 3.2 / 4.0 / 4.1 / 4.2 / 5.0 / 5.1 / 5.2 / 6.0 / 6.1
* Ruby: 2.4 / 2.5 / 2.6 / 2.7
* Rails: 5.0 / 5.1 / 5.2 / 6.0 / 6.1


## Contributing
Expand Down
8 changes: 0 additions & 8 deletions gemfiles/rails32.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions gemfiles/rails40.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions gemfiles/rails41.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions gemfiles/rails42.gemfile

This file was deleted.

3 changes: 2 additions & 1 deletion jp_prefecture.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ Gem::Specification.new do |gem|
gem.name = 'jp_prefecture'
gem.require_paths = ['lib']
gem.version = JpPrefecture::VERSION
gem.required_ruby_version = '>= 2.4.0'

gem.add_development_dependency 'rake'
gem.add_development_dependency 'rspec'
gem.add_development_dependency 'activerecord', '>= 4.2.0'
gem.add_development_dependency 'activerecord', '>= 5.0.0'
gem.add_development_dependency 'sqlite3'
gem.add_development_dependency 'simplecov'
gem.add_development_dependency 'simplecov-lcov'
Expand Down

0 comments on commit 640f68e

Please sign in to comment.