diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 183bf87..095e6ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,19 +19,9 @@ jobs: strategy: matrix: - ruby: [2.4, 2.7, '3.0', 3.1, 3.2] - rails: [4, 5, 6.0, 6.1, 7.0] + ruby: [2.7, '3.0', 3.1, 3.2] + rails: [5, 6.0, 6.1, 7.0, 7.1] exclude: - - ruby: 2.4 - rails: 6.0 - - ruby: 2.4 - rails: 6.1 - - ruby: 2.4 - rails: 7.0 - - ruby: 2.7 - rails: 4 - - ruby: '3.0' - rails: 4 - ruby: '3.0' rails: 5 - ruby: 3.1 @@ -50,7 +40,7 @@ jobs: rails: 6.1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: diff --git a/.rubocop.yml b/.rubocop.yml index 210e80a..acc0963 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -55,3 +55,6 @@ RSpec/DescribedClass: RSpec/ExampleLength: Enabled: false + +RSpec/SpecFilePathFormat: + Enabled: false diff --git a/Gemfile b/Gemfile index fa75df1..7f79068 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,13 @@ source 'https://rubygems.org' gemspec + +gem 'bundler' +gem 'ffaker' +gem 'pg', ('< 1' if ENV['RAILS_VERSION'].to_s.split.last.to_i == 4) +gem 'rake' +gem 'rspec' +gem 'rubocop-performance' +gem 'rubocop-rspec' +gem 'simplecov' +gem 'yardstick' diff --git a/active_record-pgcrypto.gemspec b/active_record-pgcrypto.gemspec index b695169..dc064c2 100644 --- a/active_record-pgcrypto.gemspec +++ b/active_record-pgcrypto.gemspec @@ -19,16 +19,5 @@ Gem::Specification.new do |spec| spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', '>= 3.2') - pg_version = '< 1' if ENV['RAILS_VERSION'].to_s.split.last.to_i == 4 - - spec.add_development_dependency 'bundler' - spec.add_development_dependency 'ffaker' - spec.add_development_dependency 'pg', pg_version - spec.add_development_dependency 'rake' - spec.add_development_dependency 'rspec' - spec.add_development_dependency 'rubocop-performance' - spec.add_development_dependency 'rubocop-rspec' - spec.add_development_dependency 'simplecov' - spec.add_development_dependency 'yardstick' spec.metadata['rubygems_mfa_required'] = 'true' end