From 0d98393e81d84c6b22d44bfeb8999671cb311cd2 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:07:06 -0500 Subject: [PATCH 01/19] Test with GitHub --- .github/workflows/ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..d2a40d0 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,74 @@ +name: CI + +on: + - push + +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + ruby-version: + - 2.7 + - '3.0' + - 3.1 + - 3.2 + - 3.3 + rails-version: + - 5.0 + - 5.1 + - 5.2 + - '6.0' + - 6.1 + - '7.0' + - 7.1 + - 7.2 + exclude: + - ruby-version: 2.7 + rails-version: 7.1 + - ruby-version: 2.7 + rails-version: 7.2 + - ruby-version: 3.0 + rails-version: 5.1 + - ruby-version: 3.0 + rails-version: 5.2 + - ruby-version: 3.0 + rails-version: 7.1 + - ruby-version: 3.0 + rails-version: 7.2 + - ruby-version: 3.1 + rails-version: 5.1 + - ruby-version: 3.1 + rails-version: 5.2 + - ruby-version: 3.1 + rails-version: 7.1 + - ruby-version: 3.1 + rails-version: 7.2 + - ruby-version: 3.2 + rails-version: 5.1 + - ruby-version: 3.2 + rails-version: 5.2 + - ruby-version: 3.2 + rails-version: 6.0 + - ruby-version: 3.2 + rails-version: 6.1 + - ruby-version: 3.3 + rails-version: 5.1 + - ruby-version: 3.3 + rails-version: 5.2 + - ruby-version: 3.3 + rails-version: 6.0 + - ruby-version: 3.3 + rails-version: 6.1 + - ruby-version: 3.3 + rails-version: 7.0 + env: + BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile + steps: + - uses: actions/checkout@v3 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: "${{ matrix.ruby-version }}" + bundler-cache: true + - run: bundle exec rake From 86afa88d9fb095aaae67cea575ac763592960bd5 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:08:31 -0500 Subject: [PATCH 02/19] Fix testing of Rails 5 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2a40d0..b8754b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - 3.2 - 3.3 rails-version: - - 5.0 + - '5.0' - 5.1 - 5.2 - '6.0' From 6fa0cc75b8b5e5e625b753f32ee8dfb8b76ed65a Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:08:53 -0500 Subject: [PATCH 03/19] Regen appraisal gemfiles --- gemfiles/rails_5.0.gemfile.lock | 17 +---------------- gemfiles/rails_5.1.gemfile.lock | 17 +---------------- gemfiles/rails_5.2.gemfile.lock | 17 +---------------- gemfiles/rails_6.0.gemfile.lock | 17 +---------------- gemfiles/rails_6.1.gemfile.lock | 17 +---------------- 5 files changed, 5 insertions(+), 80 deletions(-) diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index 8d2faa5..5b62412 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - qbxml (0.4.0) + qbxml (0.5.0) activesupport (>= 5.0.0) builder (~> 3.0) nokogiri (~> 1.5) @@ -21,7 +21,6 @@ GEM builder (3.2.4) coderay (1.1.3) concurrent-ruby (1.1.7) - diff-lcs (1.4.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) @@ -35,19 +34,6 @@ GEM pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) rake (13.0.1) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.8) @@ -63,7 +49,6 @@ DEPENDENCIES pry-nav qbxml! rake - rspec BUNDLED WITH 2.1.4 diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 3e74d53..ae6e0db 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - qbxml (0.4.0) + qbxml (0.5.0) activesupport (>= 5.0.0) builder (~> 3.0) nokogiri (~> 1.5) @@ -21,7 +21,6 @@ GEM builder (3.2.4) coderay (1.1.3) concurrent-ruby (1.1.7) - diff-lcs (1.4.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) @@ -35,19 +34,6 @@ GEM pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) rake (13.0.1) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.8) @@ -63,7 +49,6 @@ DEPENDENCIES pry-nav qbxml! rake - rspec BUNDLED WITH 2.1.4 diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 86428f8..be5036c 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - qbxml (0.4.0) + qbxml (0.5.0) activesupport (>= 5.0.0) builder (~> 3.0) nokogiri (~> 1.5) @@ -21,7 +21,6 @@ GEM builder (3.2.4) coderay (1.1.3) concurrent-ruby (1.1.7) - diff-lcs (1.4.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) @@ -35,19 +34,6 @@ GEM pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) rake (13.0.1) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.8) @@ -63,7 +49,6 @@ DEPENDENCIES pry-nav qbxml! rake - rspec BUNDLED WITH 2.1.4 diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 128e653..3f02955 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - qbxml (0.4.0) + qbxml (0.5.0) activesupport (>= 5.0.0) builder (~> 3.0) nokogiri (~> 1.5) @@ -22,7 +22,6 @@ GEM builder (3.2.4) coderay (1.1.3) concurrent-ruby (1.1.7) - diff-lcs (1.4.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) @@ -36,19 +35,6 @@ GEM pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) rake (13.0.1) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.8) @@ -65,7 +51,6 @@ DEPENDENCIES pry-nav qbxml! rake - rspec BUNDLED WITH 2.1.4 diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index b11bdaa..69f2db7 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - qbxml (0.4.0) + qbxml (0.5.0) activesupport (>= 5.0.0) builder (~> 3.0) nokogiri (~> 1.5) @@ -22,7 +22,6 @@ GEM builder (3.2.4) coderay (1.1.3) concurrent-ruby (1.1.7) - diff-lcs (1.4.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) @@ -36,19 +35,6 @@ GEM pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) rake (13.0.1) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.0) thor (1.0.1) tzinfo (2.0.3) concurrent-ruby (~> 1.0) @@ -64,7 +50,6 @@ DEPENDENCIES pry-nav qbxml! rake - rspec BUNDLED WITH 2.1.4 From e286e087c6f85d71112a24066f47f8d4df746c1a Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:14:10 -0500 Subject: [PATCH 04/19] Generate appraisal files for new versions --- Appraisals | 12 ++++++ gemfiles/rails_7.0.gemfile | 7 ++++ gemfiles/rails_7.0.gemfile.lock | 55 +++++++++++++++++++++++++ gemfiles/rails_7.1.gemfile | 7 ++++ gemfiles/rails_7.1.gemfile.lock | 71 +++++++++++++++++++++++++++++++++ gemfiles/rails_7.2.gemfile | 7 ++++ gemfiles/rails_7.2.gemfile.lock | 67 +++++++++++++++++++++++++++++++ 7 files changed, 226 insertions(+) create mode 100644 gemfiles/rails_7.0.gemfile create mode 100644 gemfiles/rails_7.0.gemfile.lock create mode 100644 gemfiles/rails_7.1.gemfile create mode 100644 gemfiles/rails_7.1.gemfile.lock create mode 100644 gemfiles/rails_7.2.gemfile create mode 100644 gemfiles/rails_7.2.gemfile.lock diff --git a/Appraisals b/Appraisals index 0e811ee..eb198fc 100644 --- a/Appraisals +++ b/Appraisals @@ -17,3 +17,15 @@ end appraise "rails-6.1" do gem "activesupport", "~> 6.1.0" end + +appraise "rails-7.0" do + gem "activesupport", "~> 7.0.0" +end + +appraise "rails-7.1" do + gem "activesupport", "~> 7.1.0" +end + +appraise "rails-7.2" do + gem "activesupport", "~> 7.2.0" +end diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile new file mode 100644 index 0000000..89955f2 --- /dev/null +++ b/gemfiles/rails_7.0.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 7.0.0" + +gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock new file mode 100644 index 0000000..512ead0 --- /dev/null +++ b/gemfiles/rails_7.0.gemfile.lock @@ -0,0 +1,55 @@ +PATH + remote: .. + specs: + qbxml (0.5.0) + activesupport (>= 5.0.0) + builder (~> 3.0) + nokogiri (~> 1.5) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.0.8.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + builder (3.3.0) + coderay (1.1.3) + concurrent-ruby (1.3.5) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + method_source (1.1.0) + mini_portile2 (2.8.9) + minitest (5.25.5) + nokogiri (1.15.7) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-nav (1.0.0) + pry (>= 0.9.10, < 0.15) + racc (1.8.1) + rake (13.3.0) + thor (1.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + +PLATFORMS + ruby + +DEPENDENCIES + activesupport (~> 7.0.0) + appraisal + pry + pry-nav + qbxml! + rake + +BUNDLED WITH + 2.1.4 diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..802ac8e --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 7.1.0" + +gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock new file mode 100644 index 0000000..f9f38c2 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile.lock @@ -0,0 +1,71 @@ +PATH + remote: .. + specs: + qbxml (0.5.0) + activesupport (>= 5.0.0) + builder (~> 3.0) + nokogiri (~> 1.5) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) + tzinfo (~> 2.0) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.1) + builder (3.3.0) + coderay (1.1.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + drb (2.2.3) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + logger (1.7.0) + method_source (1.1.0) + mini_portile2 (2.8.9) + minitest (5.25.5) + mutex_m (0.3.0) + nokogiri (1.15.7) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-nav (1.0.0) + pry (>= 0.9.10, < 0.15) + racc (1.8.1) + rake (13.3.0) + securerandom (0.3.2) + thor (1.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + +PLATFORMS + ruby + +DEPENDENCIES + activesupport (~> 7.1.0) + appraisal + pry + pry-nav + qbxml! + rake + +BUNDLED WITH + 2.1.4 diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 0000000..7debc90 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 7.2.0" + +gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock new file mode 100644 index 0000000..ea456c1 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile.lock @@ -0,0 +1,67 @@ +PATH + remote: .. + specs: + qbxml (0.5.0) + activesupport (>= 5.0.0) + builder (~> 3.0) + nokogiri (~> 1.5) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.2.2.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.1) + builder (3.3.0) + coderay (1.1.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + drb (2.2.3) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + logger (1.7.0) + method_source (1.1.0) + minitest (5.25.5) + nokogiri (1.18.8-x86_64-linux-gnu) + racc (~> 1.4) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-nav (1.0.0) + pry (>= 0.9.10, < 0.15) + racc (1.8.1) + rake (13.3.0) + securerandom (0.4.1) + thor (1.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + activesupport (~> 7.2.0) + appraisal + pry + pry-nav + qbxml! + rake + +BUNDLED WITH + 2.4.19 From 0f6ee259500cf4d38ce0db64b53b2b250c5a9914 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:34:42 -0500 Subject: [PATCH 05/19] Fix some missing things --- lib/qbxml/hash.rb | 3 +++ lib/qbxml/types.rb | 2 ++ qbxml.gemspec | 1 + 3 files changed, 6 insertions(+) diff --git a/lib/qbxml/hash.rb b/lib/qbxml/hash.rb index dfe8cf7..42fa66f 100644 --- a/lib/qbxml/hash.rb +++ b/lib/qbxml/hash.rb @@ -4,6 +4,9 @@ # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/xml_mini/nokogiri.rb # # + +require 'active_support/core_ext/object/blank.rb' + class Qbxml::Hash < ::Hash include Qbxml::Types diff --git a/lib/qbxml/types.rb b/lib/qbxml/types.rb index aa13339..6843c56 100644 --- a/lib/qbxml/types.rb +++ b/lib/qbxml/types.rb @@ -1,3 +1,5 @@ +require 'bigdecimal' + module Qbxml::Types XML_DIRECTIVES = { diff --git a/qbxml.gemspec b/qbxml.gemspec index b28070e..5aceadc 100644 --- a/qbxml.gemspec +++ b/qbxml.gemspec @@ -20,6 +20,7 @@ Gem::Specification.new do |gem| gem.add_dependency('activesupport', '>= 5.0.0') gem.add_dependency('nokogiri', '~> 1.5') gem.add_dependency('builder', '~> 3.0') + gem.add_dependency('bigdecimal') gem.add_development_dependency('pry') gem.add_development_dependency('pry-nav') From d74e7efbc526292c4e7c31de851035072ba2e93d Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:35:52 -0500 Subject: [PATCH 06/19] Regen some appraisal gemfiles --- gemfiles/rails_7.0.gemfile.lock | 4 +++- gemfiles/rails_7.1.gemfile.lock | 1 + gemfiles/rails_7.2.gemfile.lock | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 512ead0..33610cb 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -3,6 +3,7 @@ PATH specs: qbxml (0.5.0) activesupport (>= 5.0.0) + bigdecimal builder (~> 3.0) nokogiri (~> 1.5) @@ -18,6 +19,7 @@ GEM bundler rake thor (>= 0.14.0) + bigdecimal (3.2.1) builder (3.3.0) coderay (1.1.3) concurrent-ruby (1.3.5) @@ -26,7 +28,7 @@ GEM method_source (1.1.0) mini_portile2 (2.8.9) minitest (5.25.5) - nokogiri (1.15.7) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) pry (0.14.2) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index f9f38c2..7fe6846 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -3,6 +3,7 @@ PATH specs: qbxml (0.5.0) activesupport (>= 5.0.0) + bigdecimal builder (~> 3.0) nokogiri (~> 1.5) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index ea456c1..8a97b06 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -3,6 +3,7 @@ PATH specs: qbxml (0.5.0) activesupport (>= 5.0.0) + bigdecimal builder (~> 3.0) nokogiri (~> 1.5) From 97ff8c949477f3a4ee807fa4dec9cbc0e36de089 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:42:00 -0500 Subject: [PATCH 07/19] Update some gemfiles --- gemfiles/rails_7.1.gemfile.lock | 6 +++--- gemfiles/rails_7.2.gemfile.lock | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 7fe6846..7d1de5b 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -42,7 +42,7 @@ GEM mini_portile2 (2.8.9) minitest (5.25.5) mutex_m (0.3.0) - nokogiri (1.15.7) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) pry (0.14.2) @@ -52,7 +52,7 @@ GEM pry (>= 0.9.10, < 0.15) racc (1.8.1) rake (13.3.0) - securerandom (0.3.2) + securerandom (0.4.1) thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -69,4 +69,4 @@ DEPENDENCIES rake BUNDLED WITH - 2.1.4 + 2.6.9 diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 8a97b06..1f7b4aa 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -65,4 +65,4 @@ DEPENDENCIES rake BUNDLED WITH - 2.4.19 + 2.6.9 From 4b379f237c944ccf5ab2c345a2593c869a32ac99 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:50:06 -0500 Subject: [PATCH 08/19] Add a missing require, skip a Rails/Ruby combo --- .github/workflows/ci.yml | 2 ++ lib/qbxml.rb | 2 ++ lib/qbxml/hash.rb | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8754b8..f2bfa40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,8 @@ jobs: rails-version: 6.0 - ruby-version: 3.2 rails-version: 6.1 + - ruby-version: 3.3 + rails-version: 5.0 - ruby-version: 3.3 rails-version: 5.1 - ruby-version: 3.3 diff --git a/lib/qbxml.rb b/lib/qbxml.rb index 1974cf4..c06f52d 100644 --- a/lib/qbxml.rb +++ b/lib/qbxml.rb @@ -3,6 +3,8 @@ require 'nokogiri' require 'active_support/builder' require 'active_support/core_ext/string' +require 'active_support/core_ext/object/blank.rb' +require 'active_support/deprecation/deprecators.rb' class Qbxml; end diff --git a/lib/qbxml/hash.rb b/lib/qbxml/hash.rb index 42fa66f..900f42f 100644 --- a/lib/qbxml/hash.rb +++ b/lib/qbxml/hash.rb @@ -5,8 +5,6 @@ # # -require 'active_support/core_ext/object/blank.rb' - class Qbxml::Hash < ::Hash include Qbxml::Types From 3d2874f9053aaefc87c0504bc5aba8884db8b43c Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:51:39 -0500 Subject: [PATCH 09/19] Adjust require --- lib/qbxml.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qbxml.rb b/lib/qbxml.rb index c06f52d..5463bf7 100644 --- a/lib/qbxml.rb +++ b/lib/qbxml.rb @@ -2,9 +2,9 @@ require 'nokogiri' require 'active_support/builder' +require 'active_support/deprecation/deprecators.rb' require 'active_support/core_ext/string' require 'active_support/core_ext/object/blank.rb' -require 'active_support/deprecation/deprecators.rb' class Qbxml; end From 14211915ad3010cb990fc41c69370c3dc8c2d1f0 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:55:17 -0500 Subject: [PATCH 10/19] Adjust --- lib/qbxml.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qbxml.rb b/lib/qbxml.rb index 5463bf7..856e1db 100644 --- a/lib/qbxml.rb +++ b/lib/qbxml.rb @@ -2,7 +2,7 @@ require 'nokogiri' require 'active_support/builder' -require 'active_support/deprecation/deprecators.rb' +require 'active_support/deprecator' require 'active_support/core_ext/string' require 'active_support/core_ext/object/blank.rb' From 9b29f5640d6f77f677c62755fc8c8ee2b508b18b Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 15:57:34 -0500 Subject: [PATCH 11/19] All of activesupport maybe? --- lib/qbxml.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qbxml.rb b/lib/qbxml.rb index 856e1db..ab4206e 100644 --- a/lib/qbxml.rb +++ b/lib/qbxml.rb @@ -1,8 +1,8 @@ require "qbxml/version" require 'nokogiri' +require 'active_support' require 'active_support/builder' -require 'active_support/deprecator' require 'active_support/core_ext/string' require 'active_support/core_ext/object/blank.rb' From 1e3a706a49bf1ba17fc02bc4162f3e1ed79abc93 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:01:14 -0500 Subject: [PATCH 12/19] Version excludes --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2bfa40..34052a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,8 @@ jobs: rails-version: 7.1 - ruby-version: 3.0 rails-version: 7.2 + - ruby-version: 3.1 + rails-version: 5.0 - ruby-version: 3.1 rails-version: 5.1 - ruby-version: 3.1 @@ -45,6 +47,8 @@ jobs: rails-version: 7.1 - ruby-version: 3.1 rails-version: 7.2 + - ruby-version: 3.2 + rails-version: 5.0 - ruby-version: 3.2 rails-version: 5.1 - ruby-version: 3.2 @@ -53,6 +57,8 @@ jobs: rails-version: 6.0 - ruby-version: 3.2 rails-version: 6.1 + - ruby-version: 3.2 + rails-version: 7.0 - ruby-version: 3.3 rails-version: 5.0 - ruby-version: 3.3 From ed880f8f22ccbc4e34ecf246c66f3fb55c3e555a Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:07:32 -0500 Subject: [PATCH 13/19] Specify concurrent-ruby for compat --- Appraisals | 6 ++++++ gemfiles/rails_5.0.gemfile | 1 + gemfiles/rails_5.1.gemfile | 1 + gemfiles/rails_5.2.gemfile | 1 + gemfiles/rails_6.0.gemfile | 1 + gemfiles/rails_6.1.gemfile | 1 + gemfiles/rails_6.1.gemfile.lock | 15 ++++++++++----- gemfiles/rails_7.0.gemfile | 1 + gemfiles/rails_7.0.gemfile.lock | 7 ++++--- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Appraisals b/Appraisals index eb198fc..f23054b 100644 --- a/Appraisals +++ b/Appraisals @@ -1,25 +1,31 @@ appraise "rails-5.0" do gem "activesupport", "~> 5.0.0" + gem 'concurrent-ruby', '1.3.4' end appraise "rails-5.1" do gem "activesupport", "~> 5.1.0" + gem 'concurrent-ruby', '1.3.4' end appraise "rails-5.2" do gem "activesupport", "~> 5.2.0" + gem 'concurrent-ruby', '1.3.4' end appraise "rails-6.0" do gem "activesupport", "~> 6.0.0" + gem 'concurrent-ruby', '1.3.4' end appraise "rails-6.1" do gem "activesupport", "~> 6.1.0" + gem 'concurrent-ruby', '1.3.4' end appraise "rails-7.0" do gem "activesupport", "~> 7.0.0" + gem 'concurrent-ruby', '1.3.4' end appraise "rails-7.1" do diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index df19fea..7add924 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activesupport", "~> 5.0.0" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index a218404..c64903f 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activesupport", "~> 5.1.0" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 61c3cca..65ab06b 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activesupport", "~> 5.2.0" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index c6e3091..cac0fde 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activesupport", "~> 6.0.0" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 116012a..366d5df 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activesupport", "~> 6.1.0" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 69f2db7..de38044 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -3,6 +3,7 @@ PATH specs: qbxml (0.5.0) activesupport (>= 5.0.0) + bigdecimal builder (~> 3.0) nokogiri (~> 1.5) @@ -19,21 +20,24 @@ GEM bundler rake thor (>= 0.14.0) + bigdecimal (3.2.1) builder (3.2.4) coderay (1.1.3) - concurrent-ruby (1.1.7) + concurrent-ruby (1.3.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) - mini_portile2 (2.4.0) + mini_portile2 (2.8.9) minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.17.2) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) + racc (1.8.1) rake (13.0.1) thor (1.0.1) tzinfo (2.0.3) @@ -46,10 +50,11 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.1.0) appraisal + concurrent-ruby (= 1.3.4) pry pry-nav qbxml! rake BUNDLED WITH - 2.1.4 + 2.3.27 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 89955f2..70ce46c 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activesupport", "~> 7.0.0" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 33610cb..184daac 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -22,13 +22,13 @@ GEM bigdecimal (3.2.1) builder (3.3.0) coderay (1.1.3) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.4) i18n (1.14.7) concurrent-ruby (~> 1.0) method_source (1.1.0) mini_portile2 (2.8.9) minitest (5.25.5) - nokogiri (1.18.8) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) pry (0.14.2) @@ -48,10 +48,11 @@ PLATFORMS DEPENDENCIES activesupport (~> 7.0.0) appraisal + concurrent-ruby (= 1.3.4) pry pry-nav qbxml! rake BUNDLED WITH - 2.1.4 + 2.3.27 From b9b6e643554dcfbd564b9d5374179e0ee2d08c83 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:09:53 -0500 Subject: [PATCH 14/19] Adjust excludes --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34052a2..c7a5d1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,9 +44,9 @@ jobs: - ruby-version: 3.1 rails-version: 5.2 - ruby-version: 3.1 - rails-version: 7.1 + rails-version: 6.0 - ruby-version: 3.1 - rails-version: 7.2 + rails-version: 6.1 - ruby-version: 3.2 rails-version: 5.0 - ruby-version: 3.2 From 186e4fa66464fe31112aa37f27a50105ba2275bd Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:12:05 -0500 Subject: [PATCH 15/19] More excludes --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7a5d1f..4b0d799 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,10 +29,14 @@ jobs: rails-version: 7.1 - ruby-version: 2.7 rails-version: 7.2 + - ruby-version: 3.0 + rails-version: 5.0 - ruby-version: 3.0 rails-version: 5.1 - ruby-version: 3.0 rails-version: 5.2 + - ruby-version: 3.0 + rails-version: 6.0 - ruby-version: 3.0 rails-version: 7.1 - ruby-version: 3.0 From ff54598c6dcc26d2928798558d9ecd9dbf4909f4 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:15:14 -0500 Subject: [PATCH 16/19] Drop support for activesupport 5.x --- .github/workflows/ci.yml | 27 --------------------------- qbxml.gemspec | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b0d799..cdc2de3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,6 @@ jobs: - 3.2 - 3.3 rails-version: - - '5.0' - - 5.1 - - 5.2 - '6.0' - 6.1 - '7.0' @@ -29,46 +26,22 @@ jobs: rails-version: 7.1 - ruby-version: 2.7 rails-version: 7.2 - - ruby-version: 3.0 - rails-version: 5.0 - - ruby-version: 3.0 - rails-version: 5.1 - - ruby-version: 3.0 - rails-version: 5.2 - ruby-version: 3.0 rails-version: 6.0 - ruby-version: 3.0 rails-version: 7.1 - ruby-version: 3.0 rails-version: 7.2 - - ruby-version: 3.1 - rails-version: 5.0 - - ruby-version: 3.1 - rails-version: 5.1 - - ruby-version: 3.1 - rails-version: 5.2 - ruby-version: 3.1 rails-version: 6.0 - ruby-version: 3.1 rails-version: 6.1 - - ruby-version: 3.2 - rails-version: 5.0 - - ruby-version: 3.2 - rails-version: 5.1 - - ruby-version: 3.2 - rails-version: 5.2 - ruby-version: 3.2 rails-version: 6.0 - ruby-version: 3.2 rails-version: 6.1 - ruby-version: 3.2 rails-version: 7.0 - - ruby-version: 3.3 - rails-version: 5.0 - - ruby-version: 3.3 - rails-version: 5.1 - - ruby-version: 3.3 - rails-version: 5.2 - ruby-version: 3.3 rails-version: 6.0 - ruby-version: 3.3 diff --git a/qbxml.gemspec b/qbxml.gemspec index 5aceadc..5890008 100644 --- a/qbxml.gemspec +++ b/qbxml.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] - gem.add_dependency('activesupport', '>= 5.0.0') + gem.add_dependency('activesupport', '>= 6.0.0') gem.add_dependency('nokogiri', '~> 1.5') gem.add_dependency('builder', '~> 3.0') gem.add_dependency('bigdecimal') From 0674b46682f23bb21073b806514a95a83ee42345 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:16:35 -0500 Subject: [PATCH 17/19] Drop activesupport 5 appraisals --- Appraisals | 15 --------- gemfiles/rails_5.0.gemfile | 8 ----- gemfiles/rails_5.0.gemfile.lock | 54 --------------------------------- gemfiles/rails_5.1.gemfile | 8 ----- gemfiles/rails_5.1.gemfile.lock | 54 --------------------------------- gemfiles/rails_5.2.gemfile | 8 ----- gemfiles/rails_5.2.gemfile.lock | 54 --------------------------------- 7 files changed, 201 deletions(-) delete mode 100644 gemfiles/rails_5.0.gemfile delete mode 100644 gemfiles/rails_5.0.gemfile.lock delete mode 100644 gemfiles/rails_5.1.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile.lock delete mode 100644 gemfiles/rails_5.2.gemfile delete mode 100644 gemfiles/rails_5.2.gemfile.lock diff --git a/Appraisals b/Appraisals index f23054b..043e0f9 100644 --- a/Appraisals +++ b/Appraisals @@ -1,18 +1,3 @@ -appraise "rails-5.0" do - gem "activesupport", "~> 5.0.0" - gem 'concurrent-ruby', '1.3.4' -end - -appraise "rails-5.1" do - gem "activesupport", "~> 5.1.0" - gem 'concurrent-ruby', '1.3.4' -end - -appraise "rails-5.2" do - gem "activesupport", "~> 5.2.0" - gem 'concurrent-ruby', '1.3.4' -end - appraise "rails-6.0" do gem "activesupport", "~> 6.0.0" gem 'concurrent-ruby', '1.3.4' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile deleted file mode 100644 index 7add924..0000000 --- a/gemfiles/rails_5.0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 5.0.0" -gem "concurrent-ruby", "1.3.4" - -gemspec path: "../" diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock deleted file mode 100644 index 5b62412..0000000 --- a/gemfiles/rails_5.0.gemfile.lock +++ /dev/null @@ -1,54 +0,0 @@ -PATH - remote: .. - specs: - qbxml (0.5.0) - activesupport (>= 5.0.0) - builder (~> 3.0) - nokogiri (~> 1.5) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (5.0.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.3.0) - bundler - rake - thor (>= 0.14.0) - builder (3.2.4) - coderay (1.1.3) - concurrent-ruby (1.1.7) - i18n (1.8.5) - concurrent-ruby (~> 1.0) - method_source (0.9.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-nav (0.3.0) - pry (>= 0.9.10, < 0.13.0) - rake (13.0.1) - thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.8) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - activesupport (~> 5.0.0) - appraisal - pry - pry-nav - qbxml! - rake - -BUNDLED WITH - 2.1.4 diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index c64903f..0000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 5.1.0" -gem "concurrent-ruby", "1.3.4" - -gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock deleted file mode 100644 index ae6e0db..0000000 --- a/gemfiles/rails_5.1.gemfile.lock +++ /dev/null @@ -1,54 +0,0 @@ -PATH - remote: .. - specs: - qbxml (0.5.0) - activesupport (>= 5.0.0) - builder (~> 3.0) - nokogiri (~> 1.5) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (5.1.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.3.0) - bundler - rake - thor (>= 0.14.0) - builder (3.2.4) - coderay (1.1.3) - concurrent-ruby (1.1.7) - i18n (1.8.5) - concurrent-ruby (~> 1.0) - method_source (0.9.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-nav (0.3.0) - pry (>= 0.9.10, < 0.13.0) - rake (13.0.1) - thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.8) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - activesupport (~> 5.1.0) - appraisal - pry - pry-nav - qbxml! - rake - -BUNDLED WITH - 2.1.4 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 65ab06b..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 5.2.0" -gem "concurrent-ruby", "1.3.4" - -gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock deleted file mode 100644 index be5036c..0000000 --- a/gemfiles/rails_5.2.gemfile.lock +++ /dev/null @@ -1,54 +0,0 @@ -PATH - remote: .. - specs: - qbxml (0.5.0) - activesupport (>= 5.0.0) - builder (~> 3.0) - nokogiri (~> 1.5) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (5.2.4.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.3.0) - bundler - rake - thor (>= 0.14.0) - builder (3.2.4) - coderay (1.1.3) - concurrent-ruby (1.1.7) - i18n (1.8.5) - concurrent-ruby (~> 1.0) - method_source (0.9.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-nav (0.3.0) - pry (>= 0.9.10, < 0.13.0) - rake (13.0.1) - thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.8) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - activesupport (~> 5.2.0) - appraisal - pry - pry-nav - qbxml! - rake - -BUNDLED WITH - 2.1.4 From 6d0717ab120ff201ff6b6ce0d68ca393ba60b64d Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:22:44 -0500 Subject: [PATCH 18/19] Regen lockfiles --- gemfiles/rails_6.0.gemfile.lock | 17 +++++++++++------ gemfiles/rails_6.1.gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile.lock | 2 +- gemfiles/rails_7.1.gemfile.lock | 8 ++++---- gemfiles/rails_7.2.gemfile.lock | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 3f02955..b01c8f5 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -2,7 +2,8 @@ PATH remote: .. specs: qbxml (0.5.0) - activesupport (>= 5.0.0) + activesupport (>= 6.0.0) + bigdecimal builder (~> 3.0) nokogiri (~> 1.5) @@ -19,21 +20,24 @@ GEM bundler rake thor (>= 0.14.0) - builder (3.2.4) + bigdecimal (3.2.1) + builder (3.3.0) coderay (1.1.3) - concurrent-ruby (1.1.7) + concurrent-ruby (1.3.4) i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) - mini_portile2 (2.4.0) + mini_portile2 (2.8.9) minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.15.7) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-nav (0.3.0) pry (>= 0.9.10, < 0.13.0) + racc (1.8.1) rake (13.0.1) thor (1.0.1) thread_safe (0.3.6) @@ -47,6 +51,7 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.0.0) appraisal + concurrent-ruby (= 1.3.4) pry pry-nav qbxml! diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index de38044..d0545ce 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: qbxml (0.5.0) - activesupport (>= 5.0.0) + activesupport (>= 6.0.0) bigdecimal builder (~> 3.0) nokogiri (~> 1.5) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 184daac..ad613d1 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: qbxml (0.5.0) - activesupport (>= 5.0.0) + activesupport (>= 6.0.0) bigdecimal builder (~> 3.0) nokogiri (~> 1.5) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 7d1de5b..7d6aab6 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: qbxml (0.5.0) - activesupport (>= 5.0.0) + activesupport (>= 6.0.0) bigdecimal builder (~> 3.0) nokogiri (~> 1.5) @@ -42,7 +42,7 @@ GEM mini_portile2 (2.8.9) minitest (5.25.5) mutex_m (0.3.0) - nokogiri (1.18.8) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) pry (0.14.2) @@ -52,7 +52,7 @@ GEM pry (>= 0.9.10, < 0.15) racc (1.8.1) rake (13.3.0) - securerandom (0.4.1) + securerandom (0.3.2) thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -69,4 +69,4 @@ DEPENDENCIES rake BUNDLED WITH - 2.6.9 + 2.3.27 diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 1f7b4aa..ab08c95 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: qbxml (0.5.0) - activesupport (>= 5.0.0) + activesupport (>= 6.0.0) bigdecimal builder (~> 3.0) nokogiri (~> 1.5) From 8a7a53168996a717a2001fd3e578353ee9e543c2 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Sat, 31 May 2025 16:24:17 -0500 Subject: [PATCH 19/19] Regen 6.0 and 7.1 lockfiles with 2.7 --- gemfiles/rails_6.1.gemfile.lock | 6 ++---- gemfiles/rails_7.0.gemfile.lock | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index d0545ce..033944c 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -27,10 +27,8 @@ GEM i18n (1.8.5) concurrent-ruby (~> 1.0) method_source (0.9.2) - mini_portile2 (2.8.9) minitest (5.14.2) - nokogiri (1.17.2) - mini_portile2 (~> 2.8.2) + nokogiri (1.15.7-x86_64-linux) racc (~> 1.4) pry (0.12.2) coderay (~> 1.1.0) @@ -45,7 +43,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - ruby + x86_64-linux DEPENDENCIES activesupport (~> 6.1.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index ad613d1..7f042a4 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -26,10 +26,8 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) method_source (1.1.0) - mini_portile2 (2.8.9) minitest (5.25.5) - nokogiri (1.17.2) - mini_portile2 (~> 2.8.2) + nokogiri (1.15.7-x86_64-linux) racc (~> 1.4) pry (0.14.2) coderay (~> 1.1) @@ -43,7 +41,7 @@ GEM concurrent-ruby (~> 1.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES activesupport (~> 7.0.0)