From 8d73e45b297652757dfa0ee53d190f1677a41b44 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Sun, 18 Dec 2022 16:33:53 +0100 Subject: [PATCH] Drop support of Ruby 2.6, test with latest Rails versions --- .github/workflows/ci.yml | 15 ++++++--------- .rubocop.yml | 2 +- ajax-datatables-rails.gemspec | 2 +- appraisal.yml | 8 ++++---- .../{rails_5.2.6.gemfile => rails_5.2.8.gemfile} | 2 +- .../{rails_6.0.4.gemfile => rails_6.0.6.gemfile} | 2 +- .../{rails_6.1.4.gemfile => rails_6.1.7.gemfile} | 2 +- .../{rails_7.0.1.gemfile => rails_7.0.4.gemfile} | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) rename gemfiles/{rails_5.2.6.gemfile => rails_5.2.8.gemfile} (95%) rename gemfiles/{rails_6.0.4.gemfile => rails_6.0.6.gemfile} (95%) rename gemfiles/{rails_6.1.4.gemfile => rails_6.1.7.gemfile} (95%) rename gemfiles/{rails_7.0.1.gemfile => rails_7.0.4.gemfile} (95%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e53798..08534ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,24 +55,21 @@ jobs: - '3.1' - '3.0' - '2.7' - - '2.6' rails: - - rails_5.2.6 - - rails_6.0.4 - - rails_6.1.4 - - rails_7.0.1 + - rails_5.2.8 + - rails_6.0.6 + - rails_6.1.7 + - rails_7.0.4 adapter: - sqlite3 - postgresql - mysql2 - oracle_enhanced exclude: - - ruby: '2.6' - rails: rails_7.0.1 - ruby: '3.0' - rails: rails_5.2.6 + rails: rails_5.2.8 - ruby: '3.1' - rails: rails_5.2.6 + rails: rails_5.2.8 steps: - name: Checkout diff --git a/.rubocop.yml b/.rubocop.yml index 52c489f..ba60a76 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ AllCops: NewCops: enable SuggestExtensions: false - TargetRubyVersion: 2.6 + TargetRubyVersion: 2.7 Exclude: - bin/* - lib/generators/**/*.rb diff --git a/ajax-datatables-rails.gemspec b/ajax-datatables-rails.gemspec index 6921d71..2bca6f1 100644 --- a/ajax-datatables-rails.gemspec +++ b/ajax-datatables-rails.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| 'bug_tracker_uri' => 'https://github.com/jbox-web/ajax-datatables-rails/issues', } - s.required_ruby_version = '>= 2.6.0' + s.required_ruby_version = '>= 2.7.0' s.files = `git ls-files`.split("\n") diff --git a/appraisal.yml b/appraisal.yml index 5463d73..69b3b87 100644 --- a/appraisal.yml +++ b/appraisal.yml @@ -1,5 +1,5 @@ --- -5.2.6: +5.2.8: sqlite3: version: ~> 1.3.0 install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }' @@ -13,7 +13,7 @@ version: '' install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }' -6.0.4: +6.0.6: sqlite3: version: ~> 1.4.0 install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }' @@ -27,7 +27,7 @@ version: '' install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }' -6.1.4: +6.1.7: sqlite3: version: ~> 1.4.0 install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }' @@ -41,7 +41,7 @@ version: '' install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }' -7.0.1: +7.0.4: sqlite3: version: ~> 1.4.0 install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }' diff --git a/gemfiles/rails_5.2.6.gemfile b/gemfiles/rails_5.2.8.gemfile similarity index 95% rename from gemfiles/rails_5.2.6.gemfile rename to gemfiles/rails_5.2.8.gemfile index 4e1978c..6bd2b29 100644 --- a/gemfiles/rails_5.2.6.gemfile +++ b/gemfiles/rails_5.2.8.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion" -gem "rails", "5.2.6" +gem "rails", "5.2.8" install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do gem "sqlite3", "~> 1.3.0" diff --git a/gemfiles/rails_6.0.4.gemfile b/gemfiles/rails_6.0.6.gemfile similarity index 95% rename from gemfiles/rails_6.0.4.gemfile rename to gemfiles/rails_6.0.6.gemfile index eded71a..0c23f5d 100644 --- a/gemfiles/rails_6.0.4.gemfile +++ b/gemfiles/rails_6.0.6.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion" -gem "rails", "6.0.4" +gem "rails", "6.0.6" install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do gem "sqlite3", "~> 1.4.0" diff --git a/gemfiles/rails_6.1.4.gemfile b/gemfiles/rails_6.1.7.gemfile similarity index 95% rename from gemfiles/rails_6.1.4.gemfile rename to gemfiles/rails_6.1.7.gemfile index cbf8c97..19b7fbd 100644 --- a/gemfiles/rails_6.1.4.gemfile +++ b/gemfiles/rails_6.1.7.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion" -gem "rails", "6.1.4" +gem "rails", "6.1.7" install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do gem "sqlite3", "~> 1.4.0" diff --git a/gemfiles/rails_7.0.1.gemfile b/gemfiles/rails_7.0.4.gemfile similarity index 95% rename from gemfiles/rails_7.0.1.gemfile rename to gemfiles/rails_7.0.4.gemfile index 0d10d4d..0ec19b3 100644 --- a/gemfiles/rails_7.0.1.gemfile +++ b/gemfiles/rails_7.0.4.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion" -gem "rails", "7.0.1" +gem "rails", "7.0.4" install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do gem "sqlite3", "~> 1.4.0"