From 3423f8bcaa230b8e81f91533d2a4fc2f2272722e Mon Sep 17 00:00:00 2001
From: Koen Sengers <koen.sengers@drieam.com>
Date: Fri, 10 Jan 2025 10:22:32 +0100
Subject: [PATCH] build: Update rails and ruby dependencies

- Remove rails support 6.1
- Remove rails support 7.0
- Remove ruby support 3.1

- Add rails support 8.0
- Add ruby support 3.4
---
 .github/workflows/ci.yml                         |   5 ++---
 .rubocop.yml                                     |   5 ++++-
 gemfiles/.DS_Store                               | Bin 0 -> 6148 bytes
 gemfiles/rails_6_1.gemfile                       |   8 --------
 .../{rails_7_0.gemfile => rails_8_0.gemfile}     |   2 +-
 keypairs.gemspec                                 |   7 ++++---
 spec/spec_helper.rb                              |   2 +-
 7 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 gemfiles/.DS_Store
 delete mode 100644 gemfiles/rails_6_1.gemfile
 rename gemfiles/{rails_7_0.gemfile => rails_8_0.gemfile} (79%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 338da61..913c972 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,14 +26,13 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
         gemfile:
-          - rails_6_1
-          - rails_7_0
           - rails_7_1
           - rails_7_2
+          - rails_8_0
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
diff --git a/.rubocop.yml b/.rubocop.yml
index 9de98e2..ac548ea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,7 @@ require:
   - rubocop-rails # Rails-specific analysis
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
   NewCops: enable
   Exclude:
     - 'gemfiles/*'
@@ -30,6 +30,9 @@ Metrics/BlockLength:
     - 'spec/**/*.rb' # Specs just have large blocks
     - '*.gemspec'    # Is just one block
 
+Style/HashSyntax:
+  Enabled: false
+
 # We publish the gem by using a GitHub Workflow so MFA is not used
 Gemspec/RequireMFA:
   Enabled: false
diff --git a/gemfiles/.DS_Store b/gemfiles/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
deleted file mode 100644
index 12cf89f..0000000
--- a/gemfiles/rails_6_1.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 6.1.0"
-gem "lockbox", "< 2.0"
-
-gemspec path: "../"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_8_0.gemfile
similarity index 79%
rename from gemfiles/rails_7_0.gemfile
rename to gemfiles/rails_8_0.gemfile
index 9af0ae3..3b3765b 100644
--- a/gemfiles/rails_7_0.gemfile
+++ b/gemfiles/rails_8_0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0"
+gem "rails", "~> 8.0.0"
 
 gemspec path: "../"
diff --git a/keypairs.gemspec b/keypairs.gemspec
index cb5f475..6197887 100644
--- a/keypairs.gemspec
+++ b/keypairs.gemspec
@@ -17,15 +17,16 @@ Gem::Specification.new do |spec|
   MESSAGE
   spec.description = spec.summary
   spec.license     = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+
+  spec.required_ruby_version = '>= 3.2'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/Drieam/keypairs'
 
   spec.files = Dir['{app,db,lib}/**/*', 'LICENSE', 'README.md']
 
-  spec.add_dependency 'actionpack', '>= 6.0', '< 8'                # Depend on actionpack to share public keys
-  spec.add_dependency 'activerecord', '>= 6.0', '< 8'              # Depend on activerecord as ORM
+  spec.add_dependency 'actionpack', '>= 7.1', '< 9'                # Depend on actionpack to share public keys
+  spec.add_dependency 'activerecord', '>= 7.1', '< 9'              # Depend on activerecord as ORM
   spec.add_dependency 'jwt', '~> 2.5'                              # Working with JSON Web Tokens
   spec.add_dependency 'lockbox', '>= 1.3', '< 3.0'                 # Encrypt and decrypt attributes
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 20fa0c4..6e06149 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,7 +15,7 @@
 require 'rspec/rails'
 
 # Load support files
-Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].sort.each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each { |f| require f }
 
 require 'keypairs'