From a321ffd4f3be1ad5984ebf1975c5efa48508cf40 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:39:35 +0300 Subject: [PATCH 1/6] Support Rails 7.2 --- diffcrypt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffcrypt.gemspec b/diffcrypt.gemspec index 3ae32cd..bb8173a 100644 --- a/diffcrypt.gemspec +++ b/diffcrypt.gemspec @@ -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.2' + spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.3' spec.add_runtime_dependency 'thor', '>= 0.20', '< 2' spec.metadata['rubygems_mfa_required'] = 'true' end From 44b55098abea0d6990084b3e8c37e7df79967ee4 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:47:31 +0300 Subject: [PATCH 2/6] Updated Rails version matrix --- test/rails_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/rails_test.rb b/test/rails_test.rb index 360da83..5bdb80b 100644 --- a/test/rails_test.rb +++ b/test/rails_test.rb @@ -6,9 +6,10 @@ require 'open3' RAILS_VERSIONS = %w[ - 6.1.7.7 - 7.0.8.3 - 7.1.3.3 + 6.1.7.8 + 7.0.8.4 + 7.1.4 + 7.2.1 ].freeze RAILS_FLAGS = %w[ From 54e2f3dec50870890196cd97cbb977e618e25460 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:51:09 +0300 Subject: [PATCH 3/6] Bumped ruby version requirement to 3.0.0 --- diffcrypt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffcrypt.gemspec b/diffcrypt.gemspec index bb8173a..ba83b57 100644 --- a/diffcrypt.gemspec +++ b/diffcrypt.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |spec| spec.description = 'Diffable encrypted configuration files that can be safely committed into a git repository' spec.homepage = 'https://github.com/diffcrypt/diffcrypt-ruby' spec.license = 'MIT' - spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0') + spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0') # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'" From d771147d144fb495d34ef1197fff726e6722813d Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:53:50 +0300 Subject: [PATCH 4/6] Rubocop Ruby target as well --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 1956e70..c8e6d3b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ AllCops: NewCops: enable - TargetRubyVersion: 2.6 + TargetRubyVersion: 3.0 Style/ClassAndModuleChildren: Exclude: From e5d7c694befb43052329fcec813b0c67ea5cd41e Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:55:16 +0300 Subject: [PATCH 5/6] remove redundant sort --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index df48b05..304d840 100644 --- a/Rakefile +++ b/Rakefile @@ -11,4 +11,4 @@ end task default: :test path = File.expand_path(__dir__) -Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").sort.each { |f| load f } +Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { |f| load f } From e78e9426cc9266ea5f4a2d8c58c4009fd6aaa807 Mon Sep 17 00:00:00 2001 From: Lud Date: Fri, 11 Oct 2024 19:10:46 +0200 Subject: [PATCH 6/6] Update Rakefile --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 304d840..a47194d 100644 --- a/Rakefile +++ b/Rakefile @@ -11,4 +11,4 @@ end task default: :test path = File.expand_path(__dir__) -Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { |f| load f } +Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { load(_1) }