consistent ruby version in Github workflows / rubocop (including triv…

…ial adaptions)

.github/workflows/ci.build.prerelease.yml

@@ -1,5 +1,5 @@
 env:
-  RUBY_VERSION: 2.7.x
+  RUBY_VERSION: 3.3.6
 
 name: CI Build Pre-Release
 on:
@@ -12,7 +12,7 @@ jobs:
     env:
       DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
       DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         if: contains(env.DOCKER_BUILD_ENABLED, 'true')

.github/workflows/ci.build.push.master.yml

@@ -1,5 +1,5 @@
 env:
-  RUBY_VERSION: 2.7.x
+  RUBY_VERSION: 3.3.6
 
 name: CI Build Push
 on:
@@ -15,7 +15,7 @@ jobs:
       DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
       DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
       DOCKER_BUILD_ALTERNATE_ENABLED: ${{ secrets.DOCKER_BUILD_ALTERNATE_ENABLED }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check preconditions
         id: preconditions

.github/workflows/ci.build.push.yml

@@ -1,5 +1,5 @@
 env:
-  RUBY_VERSION: 2.7.x
+  RUBY_VERSION: 3.3.6
 
 name: CI Build Push
 on:
@@ -18,7 +18,7 @@ jobs:
       DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
       DOCKER_BUILD_ALTERNATE_ENABLED: ${{ secrets.DOCKER_BUILD_ALTERNATE_ENABLED }}
       DOCKER_BUILD_ON_PUSH_DISABLED: ${{ secrets.DOCKER_BUILD_ON_PUSH_DISABLED }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check preconditions
         id: preconditions

.github/workflows/ci.build.release.yml

@@ -1,5 +1,5 @@
 env:
-  RUBY_VERSION: 2.7.x
+  RUBY_VERSION: 3.3.6
 
 name: CI Build Release
 on:
@@ -12,7 +12,7 @@ jobs:
     env:
       DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
       DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         if: contains(env.DOCKER_BUILD_ENABLED, 'true')

.rubocop.yml

@@ -11,7 +11,7 @@ AllCops:
   - 'vendor/**/*'
   - 'vendor/bundle/**/*'
   DisabledByDefault: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.3
 
   NewCops: enable
 
@@ -236,6 +236,9 @@ Style/OptionalBooleanParameter:
 Style/SlicingWithRange:
   Enabled: true
 
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either
+
 RSpec/ContextWording:
   Enabled: false
 

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '>= 3.0.0'
+ruby '>= 3.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.2'

app/controllers/concerns/cookie_same_site_compat.rb

@@ -13,14 +13,14 @@ def cookie_same_site_none_incompatible?(useragent)
 
   private
 
-  IOS_VERSION_REGEXP = %r{\(iP.+; CPU .*OS (\d+)[_\d]*.*\) AppleWebKit/}.freeze
-  MACOS_VERSION_REGEXP = %r{\(Macintosh;.*Mac OS X (\d+)_(\d+)[_\d]*.*\) AppleWebKit/}.freeze
-  SAFARI_REGEXP = %r{Version/.* Safari/}.freeze
-  CHROMIUM_BASED_REGEXP = /Chrom(?:e|ium)/.freeze
-  CHROMIUM_VERSION_REGEXP = %r{Chrom[^ /]+/(\d+)[.\d]* }.freeze
-  MAC_EMBEDDED_REGEXP = %r{^Mozilla/[.\d]+ \(Macintosh;.*Mac OS X [_\d]+\) AppleWebKit/[.\d]+ \(KHTML, like Gecko\)$}.freeze
-  UC_BROWSER_REGEXP = %r{UCBrowser/}.freeze
-  UC_BROWSER_VERSION_REGEXP = %r{UCBrowser/(\d+)\.(\d+)\.(\d+)[.\d]* }.freeze
+  IOS_VERSION_REGEXP = %r{\(iP.+; CPU .*OS (\d+)[_\d]*.*\) AppleWebKit/}
+  MACOS_VERSION_REGEXP = %r{\(Macintosh;.*Mac OS X (\d+)_(\d+)[_\d]*.*\) AppleWebKit/}
+  SAFARI_REGEXP = %r{Version/.* Safari/}
+  CHROMIUM_BASED_REGEXP = /Chrom(?:e|ium)/
+  CHROMIUM_VERSION_REGEXP = %r{Chrom[^ /]+/(\d+)[.\d]* }
+  MAC_EMBEDDED_REGEXP = %r{^Mozilla/[.\d]+ \(Macintosh;.*Mac OS X [_\d]+\) AppleWebKit/[.\d]+ \(KHTML, like Gecko\)$}
+  UC_BROWSER_REGEXP = %r{UCBrowser/}
+  UC_BROWSER_VERSION_REGEXP = %r{UCBrowser/(\d+)\.(\d+)\.(\d+)[.\d]* }
 
   def webkit_same_site_bug?(useragent)
     return true if ios_version?(12, useragent)

app/models/application_redis_record.rb

@@ -146,8 +146,8 @@ def self.connection_pool
   end
   delegate :connection_pool, to: 'self.class'
 
-  def self.with_connection(&block)
-    RedisStore.with_connection(&block)
+  def self.with_connection(&)
+    RedisStore.with_connection(&)
   end
   delegate :with_connection, to: 'self.class'
 

lib/redis_store.rb

@@ -34,7 +34,7 @@ def self.before_fork
     end
   end
 
-  def self.with_connection(&block)
-    connection_pool.with(&block)
+  def self.with_connection(&)
+    connection_pool.with(&)
   end
 end