From f39225e7d1e046398e5a62b926e270d0f322a85a Mon Sep 17 00:00:00 2001 From: "P.T" Date: Tue, 4 Nov 2025 14:04:59 +0100 Subject: [PATCH 1/3] upgrade to Rails 8.0.x --- .github/workflows/ci.yml | 2 +- gemfiles/rails_8.0.gemfile | 9 +++++++++ lib/webhook_system/version.rb | 2 +- webhook_system.gemspec | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 gemfiles/rails_8.0.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 162a3d0..32c8c17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - gemfile: ['rails_7.0', 'rails_7.1', 'rails_7.2'] + gemfile: ['rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] ruby: [3.3, 3.2, 3.1] include: - gemfile: rails_7.0 diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile new file mode 100644 index 0000000..e2678e9 --- /dev/null +++ b/gemfiles/rails_8.0.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "active_attr", "~> 0.16" # git: "https://github.com/mathieujobin/active_attr", branch: "rails-7.1-support" +gem "rails", "~> 8.0.4" +gem "sqlite3" + +gemspec path: "../" diff --git a/lib/webhook_system/version.rb b/lib/webhook_system/version.rb index 00ad6f3..04e43bc 100644 --- a/lib/webhook_system/version.rb +++ b/lib/webhook_system/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module WebhookSystem - VERSION = '2.4.2' + VERSION = '2.4.3' end diff --git a/webhook_system.gemspec b/webhook_system.gemspec index 096f6be..e1faa20 100644 --- a/webhook_system.gemspec +++ b/webhook_system.gemspec @@ -37,9 +37,9 @@ Gem::Specification.new do |gem| } gem.required_ruby_version = '> 2.7.0' - gem.add_runtime_dependency 'activesupport', '> 5.0', '< 8.0' - gem.add_runtime_dependency 'activerecord', '> 5.0', '< 8.0' - gem.add_runtime_dependency 'activejob', '> 5.0', '< 8.0' + gem.add_runtime_dependency 'activesupport', '> 5.0', '< 8.1' + gem.add_runtime_dependency 'activerecord', '> 5.0', '< 8.1' + gem.add_runtime_dependency 'activejob', '> 5.0', '< 8.1' gem.add_runtime_dependency 'faraday', '> 0.9' gem.add_runtime_dependency 'faraday-encoding', '>= 0.0.2', '< 1.0' gem.add_runtime_dependency 'ph_model' From 7bb20abbb1879a0434c90b3e626b62ef168fafaa Mon Sep 17 00:00:00 2001 From: "P.T" Date: Tue, 4 Nov 2025 14:08:46 +0100 Subject: [PATCH 2/3] rubocop fix --- spec/event_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/event_spec.rb b/spec/event_spec.rb index da6139b..40d015e 100644 --- a/spec/event_spec.rb +++ b/spec/event_spec.rb @@ -6,6 +6,7 @@ let(:widget_class) do Class.new do include PhModel + attribute :foo attribute :bar From 726674699314da6caf49e5d633ce2aa7d28fade4 Mon Sep 17 00:00:00 2001 From: "P.T" Date: Tue, 4 Nov 2025 14:16:29 +0100 Subject: [PATCH 3/3] fix CI matrix --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32c8c17..a200a78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,10 +18,16 @@ jobs: fail-fast: false matrix: gemfile: ['rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] - ruby: [3.3, 3.2, 3.1] + ruby: [3.3, 3.2] include: + - gemfile: rails_7.2 + ruby: 3.1 + - gemfile: rails_7.1 + ruby: 3.1 - gemfile: rails_7.0 - ruby: '3.0' + ruby: 3.1 + - gemfile: rails_7.0 + ruby: 3.0 - gemfile: rails_7.0 ruby: 2.7 - gemfile: rails_6.1