Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RLSH-503] Add support for ActiveSupport 7.1, drop support for Sidekiq < 6.4.1 #76

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# frozen_string_literal: true

appraise "rails-6.1-sidekiq-5.2" do
appraise "rails-6.1-sidekiq-6.4" do
gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 5.2.0"
gem "sidekiq", "~> 6.4.1"
gguerini marked this conversation as resolved.
Show resolved Hide resolved
end

appraise "rails-6.1-sidekiq-6.0" do
appraise "rails-6.1-sidekiq-6.5" do
gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.0.1"
gem "sidekiq", "~> 6.5.0"
end

appraise "rails-6.1-sidekiq-6.1" do
gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.1.0"
appraise "rails-7.0-sidekiq-6.4" do
gem "activejob", "~> 7.0.0"
gem "activesupport", "~> 7.0.0"
gem "sidekiq", "~> 6.4.1"
end

appraise "rails-6.1-sidekiq-6.2" do
gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.2.0"
appraise "rails-7.0-sidekiq-6.5" do
gem "activejob", "~> 7.0.0"
gem "activesupport", "~> 7.0.0"
gem "sidekiq", "~> 6.5.0"
end

appraise "rails-6.1-sidekiq-6.3" do
gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.3.0"
appraise "rails-7.1-sidekiq-6.4" do
gem "activejob", "~> 7.1.0"
gem "activesupport", "~> 7.1.0"
gem "sidekiq", "~> 6.4.1"
end

appraise "rails-6.1-sidekiq-6.4" do
gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.4.2" # above 6.4.2 to ensure we test against breaking changes
appraise "rails-7.1-sidekiq-6.5" do
gem "activejob", "~> 7.1.0"
gem "activesupport", "~> 7.1.0"
gem "sidekiq", "~> 6.5.0"
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# sidekiq_publisher

## 5.0.0
- BREAKING: Drop support for Sidekiq < 6.1.
- Add support for ActiveSupport and ActiveJob 7.1

## 4.0.0
- BREAKING: Enqueue directly to Redis unless in a transaction ([#74](https://github.com/ezcater/sidekiq_publisher/pull/74/))

Expand Down
9 changes: 0 additions & 9 deletions gemfiles/rails_6.1_sidekiq_6.3.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails_6.1_sidekiq_6.4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ source "https://rubygems.org"

gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.4.2"
gem "sidekiq", "~> 6.4.1"

gemspec path: "../"
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ source "https://rubygems.org"

gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 5.2.0"
gem "sidekiq", "~> 6.5.0"

gemspec path: "../"
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "https://rubygems.org"

gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.0.1"
gem "activejob", "~> 7.0.0"
gem "activesupport", "~> 7.0.0"
gem "sidekiq", "~> 6.4.1"

gemspec path: "../"
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "https://rubygems.org"

gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.1.0"
gem "activejob", "~> 7.0.0"
gem "activesupport", "~> 7.0.0"
gem "sidekiq", "~> 6.5.0"

gemspec path: "../"
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "https://rubygems.org"

gem "activejob", "~> 6.1.0"
gem "activesupport", "~> 6.1.0"
gem "sidekiq", "~> 6.2.0"
gem "activejob", "~> 7.1.0"
gem "activesupport", "~> 7.1.0"
gem "sidekiq", "~> 6.4.1"

gemspec path: "../"
9 changes: 9 additions & 0 deletions gemfiles/rails_7.1_sidekiq_6.5.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activejob", "~> 7.1.0"
gem "activesupport", "~> 7.1.0"
gem "sidekiq", "~> 6.5.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/sidekiq_publisher/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module SidekiqPublisher
VERSION = "4.0.0"
VERSION = "5.0.0"
end
4 changes: 2 additions & 2 deletions sidekiq_publisher.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "simplecov", "< 0.18"

spec.add_runtime_dependency "activerecord-postgres_pub_sub", ">= 0.4.0"
spec.add_runtime_dependency "activesupport", ">= 6.1", "< 7.1"
spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7"
spec.add_runtime_dependency "activesupport", ">= 6.1", "< 7.2"
spec.add_runtime_dependency "sidekiq", ">= 6.4.1", "< 7"
end
Loading