Skip to content

Commit

Permalink
Merge pull request #257 from tnir/ruby30
Browse files Browse the repository at this point in the history
Add Ruby 3.0 support and drop 2.4/2.5 support
  • Loading branch information
gingermusketeer authored May 5, 2021
2 parents 37b35a4 + 4913c0a commit b87e21e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 23 deletions.
33 changes: 12 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,42 +58,34 @@

version: 2
jobs:
build-2-7-0:
build-3-0-1:
<<: *dockerbuild
docker:
- image: circleci/ruby:2.7.0
- image: circleci/ruby:3.0.1
environment:
BUNDLE_JOBS: "3"
BUNDLE_RETRY: "3"
BUNDLE_PATH: /home/circleci/project/vendor/bundle
build-2-6-3:
build-2-7-3:
<<: *dockerbuild
docker:
- image: circleci/ruby:2.6.3
- image: circleci/ruby:2.7.3
environment:
BUNDLE_JOBS: "3"
BUNDLE_RETRY: "3"
BUNDLE_PATH: /home/circleci/project/vendor/bundle
build-2-6-1:
<<: *dockerbuild
docker:
- image: circleci/ruby:2.6.1
environment:
BUNDLE_JOBS: "3"
BUNDLE_RETRY: "3"
BUNDLE_PATH: vendor/bundle
build-2-5-3:
build-2-6-7:
<<: *dockerbuild
docker:
- image: circleci/ruby:2.5.3
- image: circleci/ruby:2.6.7
environment:
BUNDLE_JOBS: "3"
BUNDLE_RETRY: "3"
BUNDLE_PATH: vendor/bundle
build-2-4-5:
BUNDLE_PATH: /home/circleci/project/vendor/bundle
build-2-6-1:
<<: *dockerbuild
docker:
- image: circleci/ruby:2.4.5
- image: circleci/ruby:2.6.1
environment:
BUNDLE_JOBS: "3"
BUNDLE_RETRY: "3"
Expand All @@ -103,8 +95,7 @@ workflows:
version: 2
test:
jobs:
- build-2-7-0
- build-2-6-3
- build-3-0-1
- build-2-7-3
- build-2-6-7
- build-2-6-1
- build-2-5-3
- build-2-4-5
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AllCops:
Exclude:
- "spec/**/*"
- "vendor/**/*"
TargetRubyVersion: 2.4
TargetRubyVersion: 2.6

Layout:
Enabled: false
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed

- Dropped support for Ruby 2.4 and 2.5 as they are end of life.

### Added

- Add Ruby 3.0.1 to test runs on CI.

## [0.12.0] - 2020-03-08

### Fixed
Expand Down
3 changes: 2 additions & 1 deletion rufo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
spec.bindir = "exe"
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.required_ruby_version = ">= 2.4.5"
spec.required_ruby_version = ">= 2.6.0"

spec.add_development_dependency "bundler", ">= 1.15"
spec.add_development_dependency "byebug", "~> 11.0.1"
spec.add_development_dependency "guard-rspec", "~> 4.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rexml", "~> 3.2.5"
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
spec.add_development_dependency "rubocop", "~> 0.79.0"
Expand Down

0 comments on commit b87e21e

Please sign in to comment.