diff --git a/.github/workflows/declare_schema_build.yml b/.github/workflows/pipeline.yml similarity index 72% rename from .github/workflows/declare_schema_build.yml rename to .github/workflows/pipeline.yml index caa82e17..3c769ffa 100644 --- a/.github/workflows/declare_schema_build.yml +++ b/.github/workflows/pipeline.yml @@ -13,7 +13,6 @@ jobs: adapter: [mysql, postgresql, sqlite3] ruby: [3.1, 3.2, 3.3, 3.4] gemfile: - - gemfiles/rails_6_1.gemfile - gemfiles/rails_7_0.gemfile - gemfiles/rails_7_1.gemfile - gemfiles/rails_7_2.gemfile @@ -21,24 +20,6 @@ jobs: exclude: - ruby: 3.1 gemfile: gemfiles/rails_8_0.gemfile - - adapter: mysql - ruby: 3.3 - gemfile: gemfiles/rails_6_1.gemfile - - adapter: postgresql - ruby: 3.3 - gemfile: gemfiles/rails_6_1.gemfile - - adapter: sqlite3 - ruby: 3.3 - gemfile: gemfiles/rails_6_1.gemfile - - adapter: mysql - ruby: 3.4 - gemfile: gemfiles/rails_6_1.gemfile - - adapter: postgresql - ruby: 3.4 - gemfile: gemfiles/rails_6_1.gemfile - - adapter: sqlite3 - ruby: 3.4 - gemfile: gemfiles/rails_6_1.gemfile # TODO: Support SQLite3 with Rails 8.0 - adapter: sqlite3 gemfile: gemfiles/rails_8_0.gemfile diff --git a/Appraisals b/Appraisals index 837f7215..06c76113 100644 --- a/Appraisals +++ b/Appraisals @@ -3,7 +3,7 @@ require 'json' require 'open-uri' -MIN_RAILS_VERSION = Gem::Version.new('6.1.0') +MIN_RAILS_VERSION = Gem::Version.new('7.0.0') rails_versions_to_test = Set.new diff --git a/CHANGELOG.md b/CHANGELOG.md index 36ce4efb..522f3fc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.3.2] - 2025-02-21 +### Fixed +- Removed require of `activesupport/proxy_object` which is removed in Rails 8.0 + ## [2.3.1] - 2024-12-10 ### Fixed - Fixed bug where a new model with `belongs_to :owner, polymorphic: true` would cause diff --git a/Gemfile.lock b/Gemfile.lock index e3d4f99a..f69ffdc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - declare_schema (2.3.1) + declare_schema (2.3.2) rails (>= 6.0) GEM diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index 82a42514..00000000 --- a/gemfiles/rails_6_1.gemfile +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "climate_control", "~> 0.2" -gem "mail" -gem "net-smtp" -gem "pry" -gem "pry-byebug" -gem "rails", "~> 6.1.0" -gem "responders" -gem "rspec" -gem "rspec-its" -gem "rubocop" -gem "yard" -gem "mysql2", "~> 0.5" -gem "pg", "~> 1.1" -gem "sqlite3", "~> 1.4" -gem "concurrent-ruby", "~> 1.3", "< 1.3.5" -gem "base64", ">= 0.2.0" -gem "bigdecimal", ">= 3.1" -gem "mutex_m", ">= 0.3.0" - -group :testapp do - gem "bootsnap", ">= 1.1.0", require: false - gem "listen" -end - -gemspec path: "../" diff --git a/lib/declare_schema/version.rb b/lib/declare_schema/version.rb index 7d84f522..dca75add 100644 --- a/lib/declare_schema/version.rb +++ b/lib/declare_schema/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module DeclareSchema - VERSION = "2.3.1" + VERSION = "2.3.2" end