Skip to content
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
18 changes: 14 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,29 @@ jobs:
matrix:
ruby:
- "3.1"
- "3.2"
- "3.3"
- "3.4"
- "head"
rails:
- "6.1"
- "7.1"
- "7.2"
- "8.0"
exclude:
- ruby: "3.2"
rails: "6.1"
- ruby: "3.3"
rails: "6.1"
- ruby: "3.4"
rails: "6.1"
- ruby: "head"
rails: "6.1"
- ruby: "3.1"
rails: "7.2"
- ruby: "3.1"
rails: "8.0"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -47,11 +57,11 @@ jobs:
strategy:
matrix:
ruby:
- "head"
- "3.4"
rails:
- "7.2"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
1 change: 1 addition & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SUPPORTED_RAILS_VERSIONS = %w[
6.1
7.1
7.2
8.0
].freeze

SUPPORTED_RAILS_VERSIONS.each do |version|
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ gem 'minitest', '~> 5.0'
gem 'minitest-reporters', '~> 1.6.0'
gem 'rake', '~> 13.2'
gem 'rubocop', '~> 1.25.1'
gem 'simplecov', '~> 0.22.0', require: false # CodeClimate not compatible with 0.18+ yet - https://github.com/codeclimate/test-reporter/issues/413
gem 'simplecov-lcov', '< 0.9'
2 changes: 1 addition & 1 deletion diffcrypt.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
spec.executables = %w[diffcrypt]
spec.require_paths = ['lib']

spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.3'
spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 9.0'
spec.add_runtime_dependency 'thor', '>= 0.20', '< 2'
spec.metadata['rubygems_mfa_required'] = 'true'
end
3 changes: 1 addition & 2 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
source 'https://rubygems.org'

gem 'appraisal'
gem 'concurrent-ruby', '1.3.4' # 1.3.5. breaks with Rails < 7, see https://github.com/ruby-concurrency/concurrent-ruby/commit/d7ce956dacd0b772273d39b8ed31a30cff7ecf38
gem 'minitest', '~> 5.0'
gem 'minitest-reporters', '~> 1.6.0'
gem 'rails', '~> 6.1'
gem 'rake', '~> 13.2'
gem 'rubocop', '~> 1.25.1'
gem 'simplecov', '~> 0.22.0', require: false
gem 'simplecov-lcov', '< 0.9'

gemspec path: '../'
2 changes: 0 additions & 2 deletions gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@ gem 'minitest-reporters', '~> 1.6.0'
gem 'rails', '~> 7.2'
gem 'rake', '~> 13.2'
gem 'rubocop', '~> 1.25.1'
gem 'simplecov', '~> 0.22.0', require: false
gem 'simplecov-lcov', '< 0.9'

gemspec path: '../'
4 changes: 1 addition & 3 deletions gemfiles/rails_7.1.gemfile → gemfiles/rails_8.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ source 'https://rubygems.org'
gem 'appraisal'
gem 'minitest', '~> 5.0'
gem 'minitest-reporters', '~> 1.6.0'
gem 'rails', '~> 7.1'
gem 'rails', '~> 8.0'
gem 'rake', '~> 13.2'
gem 'rubocop', '~> 1.25.1'
gem 'simplecov', '~> 0.22.0', require: false
gem 'simplecov-lcov', '< 0.9'

gemspec path: '../'
14 changes: 0 additions & 14 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
# frozen_string_literal: true

require 'simplecov'
require 'simplecov-lcov'
SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
SimpleCov::Formatter::LcovFormatter.config do |c|
c.single_report_path = 'coverage/lcov.info'
end
SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
[
SimpleCov::Formatter::HTMLFormatter,
SimpleCov::Formatter::LcovFormatter,
],
)
SimpleCov.start

$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
require 'diffcrypt'

Expand Down