From f0c37c470743b780c9541ee5a99841b34c597131 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 14:38:23 -0800 Subject: [PATCH 1/6] Remove old Rails < 7 gemfiles --- Appraisals | 2 +- abc.txt.tmp | 0 gemfiles/rails_6_1.gemfile | 30 ------------------------------ 3 files changed, 1 insertion(+), 31 deletions(-) create mode 100644 abc.txt.tmp delete mode 100644 gemfiles/rails_6_1.gemfile diff --git a/Appraisals b/Appraisals index 837f7215f..06c761132 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/abc.txt.tmp b/abc.txt.tmp new file mode 100644 index 000000000..e69de29bb diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index 82a425143..000000000 --- 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: "../" From 95491e25f8a72586f2a56a3f93982f1f15f71d7a Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 14:43:05 -0800 Subject: [PATCH 2/6] remove tmp file --- abc.txt.tmp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 abc.txt.tmp diff --git a/abc.txt.tmp b/abc.txt.tmp deleted file mode 100644 index e69de29bb..000000000 From cb3cbdb7a0516e7c73c5ba169f0b8cfb92223fa3 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Thu, 20 Feb 2025 14:11:39 -0800 Subject: [PATCH 3/6] remove steps for rails 6 gemfiles --- .github/workflows/declare_schema_build.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/declare_schema_build.yml b/.github/workflows/declare_schema_build.yml index caa82e172..3c769ffa9 100644 --- a/.github/workflows/declare_schema_build.yml +++ b/.github/workflows/declare_schema_build.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 From db91d3cf8bd689b8a0a06162b8d9da8bb98671a7 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Thu, 20 Feb 2025 14:20:41 -0800 Subject: [PATCH 4/6] Rename declare_schema_build.yml to pipeline.yml --- .github/workflows/{declare_schema_build.yml => pipeline.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{declare_schema_build.yml => pipeline.yml} (100%) diff --git a/.github/workflows/declare_schema_build.yml b/.github/workflows/pipeline.yml similarity index 100% rename from .github/workflows/declare_schema_build.yml rename to .github/workflows/pipeline.yml From 8042ecb978c705cc8db8230e89cbf89cb2b59298 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Fri, 21 Feb 2025 17:20:55 -0800 Subject: [PATCH 5/6] prepare for full release --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/declare_schema/version.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36ce4efbb..6a044735c 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-24 +### 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 e3d4f99af..f69ffdc4f 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/lib/declare_schema/version.rb b/lib/declare_schema/version.rb index 7d84f522f..dca75adda 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 From a3c01a30d0903054bcecaea9793418c8a45c4fbe Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Fri, 21 Feb 2025 17:21:13 -0800 Subject: [PATCH 6/6] update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a044735c..522f3fc4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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-24 +## [2.3.2] - 2025-02-21 ### Fixed - Removed require of `activesupport/proxy_object` which is removed in Rails 8.0