Add Ruby 3.3.0 and Drop Rails 6.0 and Ruby 2.7 (#57)

salsify · Jan 5, 2024 · f68a534 · f68a534
1 parent 70960f7
commit f68a534
Show file tree

Hide file tree

Showing 59 changed files with 30 additions and 892 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: cimg/ruby:2.7.8
+      - image: cimg/ruby:3.0.6
     working_directory: ~/safer_rails_console
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-gems-ruby-2.7.8-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
-            - v2-gems-ruby-2.7.8-
+            - v2-gems-ruby-3.0.6-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-gems-ruby-3.0.6-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v2-gems-ruby-2.7.8-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v2-gems-ruby-3.0.6-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -36,7 +36,7 @@ jobs:
         environment:
           CIRCLE_TEST_REPORTS: "test-results"
           BUNDLE_GEMFILE: "/home/circleci/safer_rails_console/<< parameters.gemfile >>"
-      - image: cimg/postgres:12.9
+      - image: cimg/postgres:14.7
         environment:
           POSTGRES_USER: "circleci"
           POSTGRES_DB: "safer_rails_console_test"
@@ -74,17 +74,11 @@ workflows:
           matrix:
             parameters:
               ruby_version:
-              - "2.7.8"
-              - "3.0.6"
-              - "3.1.4"
-              - "3.2.2"
+                - 3.0.6
+                - 3.1.4
+                - 3.2.2
+                - 3.3.0
               gemfile:
-              - "gemfiles/6.0.gemfile"
-              - "gemfiles/6.1.gemfile"
-              - "gemfiles/7.0.gemfile"
-              - "gemfiles/7.1.gemfile"
-            exclude:
-              - ruby_version: "3.1.4"
-                gemfile: "gemfiles/6.0.gemfile"
-              - ruby_version: "3.2.2"
-                gemfile: "gemfiles/6.0.gemfile"
+                - gemfiles/6.1.gemfile
+                - gemfiles/7.0.gemfile
+                - gemfiles/7.1.gemfile
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,7 +2,7 @@ inherit_gem:
   salsify_rubocop: conf/rubocop_rails.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/**/*'

diff --git a/Appraisals b/Appraisals
@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
-appraise '6.0' do
-  gem 'rails', '~> 6.0.0'
-end
-
 appraise '6.1' do
-  gem 'rails', '~> 6.1.0'
+  gem 'rails', '~> 6.1.7.6'
 end
 
 appraise '7.0' do
-  gem 'rails', '~> 7.0.0'
+  gem 'rails', '~> 7.0.8'
 end
 
 appraise '7.1' do
-  gem 'rails', '~> 7.1.0'
+  gem 'rails', '~> 7.1.2'
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.8.0
+- Drop support for Ruby 2.7.
+- Drop support for Rails 6.0.
+- Add support for Ruby 3.3.
+
 ## v0.7.0
 - Add support for Rails 7.1.
 

diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 6.1.7.6"
 
 gemspec path: "../"
diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0"
+gem "rails", "~> 7.0.8"
 
 gemspec path: "../"
diff --git a/gemfiles/7.1.gemfile b/gemfiles/7.1.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.1.0"
+gem "rails", "~> 7.1.2"
 
 gemspec path: "../"
diff --git a/lib/safer_rails_console/version.rb b/lib/safer_rails_console/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SaferRailsConsole
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end
diff --git a/safer_rails_console.gemspec b/safer_rails_console.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.2'
   spec.add_development_dependency 'bundler', '~> 2.0'
@@ -46,5 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'salsify_rubocop', '~> 1.27.0'
 
-  spec.add_runtime_dependency 'rails', '>= 6.0', '< 7.2'
+  spec.add_runtime_dependency 'rails', '>= 6.1', '< 7.2'
 end
diff --git a/spec/internal/rails_6_0/.gitignore b/spec/internal/rails_6_0/.gitignore
diff --git a/spec/internal/rails_6_0/Gemfile b/spec/internal/rails_6_0/Gemfile
diff --git a/spec/internal/rails_6_0/README.md b/spec/internal/rails_6_0/README.md
diff --git a/spec/internal/rails_6_0/Rakefile b/spec/internal/rails_6_0/Rakefile
diff --git a/spec/internal/rails_6_0/app/assets/config/manifest.js b/spec/internal/rails_6_0/app/assets/config/manifest.js
diff --git a/spec/internal/rails_6_0/app/assets/stylesheets/application.css b/spec/internal/rails_6_0/app/assets/stylesheets/application.css
diff --git a/spec/internal/rails_6_0/app/controllers/application_controller.rb b/spec/internal/rails_6_0/app/controllers/application_controller.rb
diff --git a/spec/internal/rails_6_0/app/helpers/application_helper.rb b/spec/internal/rails_6_0/app/helpers/application_helper.rb
diff --git a/spec/internal/rails_6_0/app/jobs/application_job.rb b/spec/internal/rails_6_0/app/jobs/application_job.rb
diff --git a/spec/internal/rails_6_0/app/models/application_record.rb b/spec/internal/rails_6_0/app/models/application_record.rb
diff --git a/spec/internal/rails_6_0/app/models/model.rb b/spec/internal/rails_6_0/app/models/model.rb
diff --git a/spec/internal/rails_6_0/app/views/layouts/application.html.erb b/spec/internal/rails_6_0/app/views/layouts/application.html.erb
diff --git a/spec/internal/rails_6_0/bin/bundle b/spec/internal/rails_6_0/bin/bundle
diff --git a/spec/internal/rails_6_0/bin/rails b/spec/internal/rails_6_0/bin/rails
diff --git a/spec/internal/rails_6_0/bin/rake b/spec/internal/rails_6_0/bin/rake
diff --git a/spec/internal/rails_6_0/bin/setup b/spec/internal/rails_6_0/bin/setup
diff --git a/spec/internal/rails_6_0/bin/update b/spec/internal/rails_6_0/bin/update
diff --git a/spec/internal/rails_6_0/config.ru b/spec/internal/rails_6_0/config.ru