Skip to content

Commit

Permalink
Merge pull request #341 from kalashnikovisme/rails_7.2.0
Browse files Browse the repository at this point in the history
Add support of Rails 7.2.0
  • Loading branch information
mvz authored Aug 10, 2024
2 parents cf1bdf4 + 4714aa0 commit d7aa03f
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 9 deletions.
9 changes: 9 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,12 @@ appraise "active_record_71" do
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0", platforms: [:jruby]
end
end

appraise "active_record_72" do
gem "activerecord", "~> 7.2.0", require: "active_record"
gem "activesupport", "~> 7.2.0", require: "active_support"

group :development do
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0", platforms: [:jruby]
end
end
4 changes: 2 additions & 2 deletions acts_as_paranoid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
spec.files = File.read("Manifest.txt").split
spec.require_paths = ["lib"]

spec.add_dependency "activerecord", ">= 6.1", "< 7.2"
spec.add_dependency "activesupport", ">= 6.1", "< 7.2"
spec.add_dependency "activerecord", ">= 6.1", "< 8"
spec.add_dependency "activesupport", ">= 6.1", "< 8"

spec.add_development_dependency "appraisal", "~> 2.3"
spec.add_development_dependency "minitest", "~> 5.14"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/active_record_61.gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/active_record_70.gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/active_record_71.gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
Expand Down
13 changes: 13 additions & 0 deletions gemfiles/active_record_72.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "~> 7.2.0", require: "active_record"
gem "activesupport", "~> 7.2.0", require: "active_support"

group :development do
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0", platforms: [:jruby]
gem "sqlite3", "~> 1.4", platforms: [:ruby]
end

gemspec path: "../"
7 changes: 6 additions & 1 deletion test/legacy/validations_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ class ParanoidWithSerializedColumn < ActiveRecord::Base
acts_as_paranoid
validates_as_paranoid

serialize :colors, Array

if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('7.2')
serialize :colors, Array
else
serialize :colors
end

validates_uniqueness_of_without_deleted :colors
end
Expand Down

0 comments on commit d7aa03f

Please sign in to comment.