From 24380a91d94af30ed93273ff312a4bd207b663bd Mon Sep 17 00:00:00 2001
From: bodrovis <bodrovis@protonmail.com>
Date: Tue, 14 Nov 2023 22:25:58 +0200
Subject: [PATCH] prepare for v6

---
 .github/workflows/ci.yml          |  1 -
 .rubocop.yml                      |  2 +-
 CHANGELOG.md                      |  6 ++++++
 angular_rails_csrf.gemspec        |  2 +-
 gemfiles/Gemfile-rails-6-0        | 16 ----------------
 gemfiles/Gemfile-rails-6-1        | 16 ----------------
 lib/angular_rails_csrf/version.rb |  2 +-
 test/dummy/config/application.rb  |  1 +
 8 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 gemfiles/Gemfile-rails-6-0
 delete mode 100644 gemfiles/Gemfile-rails-6-1

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64109ef..804ad4e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,6 @@ jobs:
           - gemfiles/Gemfile-rails-6-1
           - gemfiles/Gemfile-rails-6-0
         ruby:
-          - 2.7
           - '3.0'
           - 3.1
           - 3.2
diff --git a/.rubocop.yml b/.rubocop.yml
index db8142d..d8532c1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,7 @@ require:
  - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 Metrics/BlockLength:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df43ebe..793e57e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.0.0 (14-Nov-23)
+
+* **Breaking change**: drop support for Ruby < 3. If you need to support older Rubies, stay on v5
+* Test only with Rails 7
+* Fix some failing tests, minor tweaks
+
 ## 5.0.0 (14-Dec-21)
 
 * Add support for Rails 7.
diff --git a/angular_rails_csrf.gemspec b/angular_rails_csrf.gemspec
index 6e1e065..f0d644b 100644
--- a/angular_rails_csrf.gemspec
+++ b/angular_rails_csrf.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['lib/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 3.0'
 
   s.add_runtime_dependency 'railties', '>= 3', '< 8'
 
diff --git a/gemfiles/Gemfile-rails-6-0 b/gemfiles/Gemfile-rails-6-0
deleted file mode 100644
index 373dc0a..0000000
--- a/gemfiles/Gemfile-rails-6-0
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec path: ".."
-
-group :test do
-  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
-  gem 'rake', '~> 13.0'
-  gem 'test-unit', '~> 3.2'
-  gem 'rails', '~> 6.0'
-  gem 'codecov',                   '~> 0.2'
-  gem 'rubocop',                   '~> 1.0'
-  gem 'rubocop-performance',       '~> 1.5'
-  gem 'simplecov',                 '~> 0.16'
-end
diff --git a/gemfiles/Gemfile-rails-6-1 b/gemfiles/Gemfile-rails-6-1
deleted file mode 100644
index 444a6a4..0000000
--- a/gemfiles/Gemfile-rails-6-1
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec path: ".."
-
-group :test do
-  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
-  gem 'rake', '~> 13.0'
-  gem 'test-unit', '~> 3.2'
-  gem 'rails', '~> 6.1'
-  gem 'codecov',                   '~> 0.2'
-  gem 'rubocop',                   '~> 1.0'
-  gem 'rubocop-performance',       '~> 1.5'
-  gem 'simplecov',                 '~> 0.16'
-end
diff --git a/lib/angular_rails_csrf/version.rb b/lib/angular_rails_csrf/version.rb
index f2ffe26..ffbe125 100644
--- a/lib/angular_rails_csrf/version.rb
+++ b/lib/angular_rails_csrf/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AngularRailsCsrf
-  VERSION = '5.0.0'
+  VERSION = '6.0.0'
 end
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index 6f28142..e8413b9 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -13,5 +13,6 @@ class Application < Rails::Application
                              '437711d0ad314baf13efc0d35d7568d2e469668a7021cf5e945c667bd16507777aedb770f83'
     config.eager_load = false # You get yelled at if you don't set this
     config.active_support.test_order = :random
+    config.load_defaults 7.0
   end
 end