From 400acd8e559ab45842cec477314cb9a5665dd5c9 Mon Sep 17 00:00:00 2001 From: Josh Branham Date: Wed, 15 Jan 2025 20:45:40 -0700 Subject: [PATCH 1/3] Set required_ruby_version=2.7.0 --- attr_encrypted.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attr_encrypted.gemspec b/attr_encrypted.gemspec index a556d41..d553a54 100644 --- a/attr_encrypted.gemspec +++ b/attr_encrypted.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- test/*`.split("\n") - s.required_ruby_version = '>= 2.6.0' + s.required_ruby_version = '>= 2.7.0' s.add_dependency('encryptor', ['~> 3.0.0']) # support for testing with specific active record version From 21a3d584a59e39ff693e6ccbb85b20aa10219f36 Mon Sep 17 00:00:00 2001 From: Josh Branham Date: Wed, 15 Jan 2025 21:08:11 -0700 Subject: [PATCH 2/3] Other fixes --- .github/workflows/CI.yml | 1 + attr_encrypted.gemspec | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 74c380a..925196b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,5 +39,6 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true + cache-version: 1 - run: | bundle exec rake test diff --git a/attr_encrypted.gemspec b/attr_encrypted.gemspec index d553a54..93a33b0 100644 --- a/attr_encrypted.gemspec +++ b/attr_encrypted.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |s| activerecord_version = if ENV.key?('ACTIVERECORD') "~> #{ENV['ACTIVERECORD']}.0" else - '>= 2.0.0' + '>= 6.0.0' end s.add_development_dependency('activerecord', activerecord_version) s.add_development_dependency('actionpack', activerecord_version) @@ -44,7 +44,6 @@ Gem::Specification.new do |s| else s.add_development_dependency('sqlite3', '= 1.5.4') end - s.add_development_dependency('dm-sqlite-adapter') s.add_development_dependency('pry') s.add_development_dependency('simplecov') s.add_development_dependency('simplecov-rcov') From 381b594489cd39461292d6b735ce109949144ecc Mon Sep 17 00:00:00 2001 From: Josh Branham Date: Wed, 15 Jan 2025 21:13:20 -0700 Subject: [PATCH 3/3] Wip --- test/test_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index 379c892..72c1f29 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -16,6 +16,7 @@ end require 'minitest/autorun' +require 'active_support' require 'active_record' require 'digest/sha2' require 'sequel'