From 7c6e40ec226eb826e2e18bcb52cb6261136af0ad Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 11:20:17 -0700 Subject: [PATCH 01/27] Fix for ruby 3.1.4 support --- .ruby-version | 2 +- CHANGELOG.md | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 6a81b4c..0aec50e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.1.4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fc2ec0..6d4961f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,4 +11,9 @@ - Allow for not checking `inside_transaction?` on primary database (https://github.com/joinhandshake/knockoff/pull/13) - Allow setting `Knockoff.default_target` to set the default target other than `:primary` (https://github.com/joinhandshake/knockoff/pull/11) - Drop Ruby 2.2 support -- Add Ruby 2.5 support \ No newline at end of file +- Add Ruby 2.5 support + +## 1.4.0 + +Update to be Rails 6.1 compatible + From d984d99d852647c00ee2fe05a28494f1b8e1a1d2 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 11:26:10 -0700 Subject: [PATCH 02/27] invalidate cache --- .github/workflows/ruby.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 8364ff8..96c29fa 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -19,5 +19,6 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically + cache-version: 1 - name: Run tests run: bundle exec rake spec \ No newline at end of file From e419a0ffe85ede714e5ee62a792fd15b9cd2fe96 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 11:42:05 -0700 Subject: [PATCH 03/27] make sqlite a runtime dependency --- knockoff.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index 580dd3f..d217f13 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -20,9 +20,9 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'activerecord', '>= 6', '< 7' spec.add_runtime_dependency 'activesupport', '>= 6', '< 7' + spec.add_runtime_dependency 'sqlite3' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" - spec.add_development_dependency 'sqlite3' end From f93d23541b312eff701a1314728a61200fcb6f3a Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 11:43:50 -0700 Subject: [PATCH 04/27] test with 3.1 --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 96c29fa..1fc7fc1 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4'] + ruby-version: ['2.6.10', '2.7.8', '3.0.6'] steps: # Pin to this commit: v2 From 72f5439852788190bcf9da26199fc5000177944a Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 11:43:50 -0700 Subject: [PATCH 05/27] test without 3.1 --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 96c29fa..1fc7fc1 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4'] + ruby-version: ['2.6.10', '2.7.8', '3.0.6'] steps: # Pin to this commit: v2 From c2b3a3bd7be3cfc0688dedd8519893f667e89d62 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 11:48:03 -0700 Subject: [PATCH 06/27] re-add 3.1.4 --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 1fc7fc1..96c29fa 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - ruby-version: ['2.6.10', '2.7.8', '3.0.6'] + ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4'] steps: # Pin to this commit: v2 From 2317a08741a567a0f027083b9d921da946abc4bf Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 12:00:54 -0700 Subject: [PATCH 07/27] re-add 3.1.4 --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 1fc7fc1..96c29fa 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - ruby-version: ['2.6.10', '2.7.8', '3.0.6'] + ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4'] steps: # Pin to this commit: v2 From 14d0fa77da09a0eef559dccc223ec4470bd498f1 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 12:23:38 -0700 Subject: [PATCH 08/27] specify exact active record version --- .github/workflows/ruby.yml | 1 + knockoff.gemspec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 96c29fa..838fb75 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -20,5 +20,6 @@ jobs: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 1 + - name: Run tests run: bundle exec rake spec \ No newline at end of file diff --git a/knockoff.gemspec b/knockoff.gemspec index d217f13..5388685 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency 'activerecord', '>= 6', '< 7' - spec.add_runtime_dependency 'activesupport', '>= 6', '< 7' + spec.add_runtime_dependency 'activerecord', '6.1.7.7' + spec.add_runtime_dependency 'activesupport', '6.1.7.7' spec.add_runtime_dependency 'sqlite3' spec.add_development_dependency "bundler" From 8901de4a4257d76216f63d0368cfc9e9de62dd1c Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 12:33:09 -0700 Subject: [PATCH 09/27] remove from gemspec --- knockoff.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index 5388685..51a86b5 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -20,7 +20,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'activerecord', '6.1.7.7' spec.add_runtime_dependency 'activesupport', '6.1.7.7' - spec.add_runtime_dependency 'sqlite3' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" From 43d9a36dce1ee4c6a64c4b39991162e5764e821c Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 12:34:33 -0700 Subject: [PATCH 10/27] try only 3.1.4 --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 838fb75..1034161 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4'] + ruby-version: ['3.1.4'] steps: # Pin to this commit: v2 From 1ca65479df4dd2902151efaf7dc7455a2b63f165 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 12:37:20 -0700 Subject: [PATCH 11/27] revert --- .github/workflows/ruby.yml | 2 +- knockoff.gemspec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 1034161..838fb75 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - ruby-version: ['3.1.4'] + ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4'] steps: # Pin to this commit: v2 diff --git a/knockoff.gemspec b/knockoff.gemspec index 51a86b5..5388685 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -20,6 +20,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'activerecord', '6.1.7.7' spec.add_runtime_dependency 'activesupport', '6.1.7.7' + spec.add_runtime_dependency 'sqlite3' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" From cc03bee2cdf27c06bcd5790c1770dce4cfb0b5ac Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 12:43:26 -0700 Subject: [PATCH 12/27] Set sqlite version --- knockoff.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index 5388685..473cb9d 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'activerecord', '6.1.7.7' spec.add_runtime_dependency 'activesupport', '6.1.7.7' - spec.add_runtime_dependency 'sqlite3' + spec.add_runtime_dependency 'sqlite3', '2.0.3' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" From bb3090384ed38faa1c9d2ae20ca06a16ec6c9671 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 13:34:03 -0700 Subject: [PATCH 13/27] update cache version --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 838fb75..2085343 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -19,7 +19,7 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically - cache-version: 1 + cache-version: 2 - name: Run tests run: bundle exec rake spec \ No newline at end of file From 6edeaecea9d517b15a69623d5a5c19a68679a643 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 14:30:58 -0700 Subject: [PATCH 14/27] Remove gemfile.lock from gitignore. Gems should include locked gemfile --- .gitignore | 3 +-- Gemfile.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 14a1ab5..c572cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ /.bundle/ /.yardoc -/Gemfile.lock /_yardoc/ /coverage/ /doc/ /pkg/ /spec/reports/ /tmp/ -/spec/tmp \ No newline at end of file +/spec/tmp diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..d2d93ca --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,57 @@ +PATH + remote: . + specs: + knockoff (1.4.0) + activerecord (>= 6, < 7) + activesupport (>= 6, < 7) + sqlite3 + +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activesupport (6.1.7.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + concurrent-ruby (1.2.2) + diff-lcs (1.5.0) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + minitest (5.20.0) + rake (10.5.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + sqlite3 (1.7.0-arm64-darwin) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-23 + +DEPENDENCIES + bundler + knockoff! + rake (~> 10.0) + rspec + +BUNDLED WITH + 2.4.22 From cf74dd463487c9ea60d6bf471e47c3a4a27cd76a Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 14:40:17 -0700 Subject: [PATCH 15/27] gemspec edits --- Gemfile.lock | 20 ++++++++++---------- knockoff.gemspec | 5 ++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2d93ca..efbe437 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,19 +2,18 @@ PATH remote: . specs: knockoff (1.4.0) - activerecord (>= 6, < 7) - activesupport (>= 6, < 7) - sqlite3 + activerecord (= 6.1.7.7) + activesupport (= 6.1.7.7) GEM remote: https://rubygems.org/ specs: - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activesupport (6.1.7.6) + activemodel (6.1.7.7) + activesupport (= 6.1.7.7) + activerecord (6.1.7.7) + activemodel (= 6.1.7.7) + activesupport (= 6.1.7.7) + activesupport (6.1.7.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -39,7 +38,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) - sqlite3 (1.7.0-arm64-darwin) + sqlite3 (2.0.3-arm64-darwin) tzinfo (2.0.6) concurrent-ruby (~> 1.0) zeitwerk (2.6.12) @@ -52,6 +51,7 @@ DEPENDENCIES knockoff! rake (~> 10.0) rspec + sqlite3 BUNDLED WITH 2.4.22 diff --git a/knockoff.gemspec b/knockoff.gemspec index 473cb9d..e68d3c9 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -14,15 +14,14 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.bindir = "bin" spec.require_paths = ["lib"] spec.add_runtime_dependency 'activerecord', '6.1.7.7' spec.add_runtime_dependency 'activesupport', '6.1.7.7' - spec.add_runtime_dependency 'sqlite3', '2.0.3' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" + spec.add_development_dependency 'sqlite3' end From 4d68e4fc1abab175694c207352bfa4f430f1b5bd Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 14:47:40 -0700 Subject: [PATCH 16/27] update platoform... Why is this here? --- Gemfile.lock | 2 ++ knockoff.gemspec | 1 + 2 files changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index efbe437..81f9987 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,12 +39,14 @@ GEM rspec-support (~> 3.12.0) rspec-support (3.12.1) sqlite3 (2.0.3-arm64-darwin) + sqlite3 (2.0.3-x86_64-linux-gnu) tzinfo (2.0.6) concurrent-ruby (~> 1.0) zeitwerk (2.6.12) PLATFORMS arm64-darwin-23 + x86_64-linux DEPENDENCIES bundler diff --git a/knockoff.gemspec b/knockoff.gemspec index e68d3c9..b1c2558 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -13,6 +13,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/sgringwe/knockoff" spec.license = "MIT" + spec.platform = Gem::Platform::RUBY spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } spec.bindir = "bin" spec.require_paths = ["lib"] From 90547b07ecf5a5ecbae18c7bad2f1f341478dbfd Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:23:36 -0700 Subject: [PATCH 17/27] try locing to lower version --- knockoff.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index b1c2558..818ea67 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -24,5 +24,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" - spec.add_development_dependency 'sqlite3' + spec.add_development_dependency 'sqlite3', "< 2" end From e1098e1ae17fe7ad193dccfb08dadd517a1077fa Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:36:40 -0700 Subject: [PATCH 18/27] update deps --- Gemfile.lock | 38 ++++++++++++++++++------------------- ci/install_modern_sqlite.sh | 13 ------------- 2 files changed, 19 insertions(+), 32 deletions(-) delete mode 100755 ci/install_modern_sqlite.sh diff --git a/Gemfile.lock b/Gemfile.lock index 81f9987..cb80280 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,30 +19,30 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - i18n (1.14.1) + concurrent-ruby (1.3.4) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.0) + minitest (5.24.1) rake (10.5.0) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - sqlite3 (2.0.3-arm64-darwin) - sqlite3 (2.0.3-x86_64-linux-gnu) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86_64-linux) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.12) + zeitwerk (2.6.17) PLATFORMS arm64-darwin-23 @@ -53,7 +53,7 @@ DEPENDENCIES knockoff! rake (~> 10.0) rspec - sqlite3 + sqlite3 (< 2) BUNDLED WITH 2.4.22 diff --git a/ci/install_modern_sqlite.sh b/ci/install_modern_sqlite.sh deleted file mode 100755 index 7e3e25e..0000000 --- a/ci/install_modern_sqlite.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -set -e # halt script on error - -sudo apt-get autoremove sqlite3 -sudo apt-get install python-software-properties -sudo apt-add-repository -y ppa:travis-ci/sqlite3 -sudo apt-get -y update -sudo apt-cache show sqlite3 -sudo apt-get install sqlite3=3.7.15.1-1~travis1 -sudo sqlite3 -version -sudo psql --version -sudo mysql --version -gem update bundler \ No newline at end of file From 6563268e0d53b356e0b8713fb91eeb93bea12056 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:40:00 -0700 Subject: [PATCH 19/27] update action plaform version --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 2085343..5c1de93 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -5,7 +5,7 @@ on: push jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: From b235c92731439cd8286a80d2854c1ab65ddda359 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:50:35 -0700 Subject: [PATCH 20/27] add platforms --- Gemfile.lock | 18 +++++++++++++----- knockoff.gemspec | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cb80280..7432e39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,14 +38,22 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - sqlite3 (1.7.3-arm64-darwin) - sqlite3 (1.7.3-x86_64-linux) + sqlite3 (1.5.0-aarch64-linux) + sqlite3 (1.5.0-arm-linux) + sqlite3 (1.5.0-arm64-darwin) + sqlite3 (1.5.0-x86-linux) + sqlite3 (1.5.0-x86_64-darwin) + sqlite3 (1.5.0-x86_64-linux) tzinfo (2.0.6) concurrent-ruby (~> 1.0) zeitwerk (2.6.17) PLATFORMS - arm64-darwin-23 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -53,7 +61,7 @@ DEPENDENCIES knockoff! rake (~> 10.0) rspec - sqlite3 (< 2) + sqlite3 (= 1.5.0) BUNDLED WITH - 2.4.22 + 2.5.17 diff --git a/knockoff.gemspec b/knockoff.gemspec index 818ea67..24a20b7 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -24,5 +24,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" - spec.add_development_dependency 'sqlite3', "< 2" + spec.add_development_dependency 'sqlite3', "1.5.0" end From 77ea2e5c620c71a9fdc3cf0573a38c25208bf46d Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:52:57 -0700 Subject: [PATCH 21/27] test unlocker active record version --- knockoff.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index 24a20b7..bff2de4 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -18,11 +18,11 @@ Gem::Specification.new do |spec| spec.bindir = "bin" spec.require_paths = ["lib"] - spec.add_runtime_dependency 'activerecord', '6.1.7.7' - spec.add_runtime_dependency 'activesupport', '6.1.7.7' + spec.add_runtime_dependency 'activerecord' + spec.add_runtime_dependency 'activesupport' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" - spec.add_development_dependency 'sqlite3', "1.5.0" + spec.add_development_dependency 'sqlite3', "~> 1.5.0" end From 4cf634b4ab72c3cc4912c5e6eb5381c29b9c0448 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:53:44 -0700 Subject: [PATCH 22/27] set flex activerecord version --- knockoff.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index bff2de4..e23aa79 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |spec| spec.bindir = "bin" spec.require_paths = ["lib"] - spec.add_runtime_dependency 'activerecord' - spec.add_runtime_dependency 'activesupport' + spec.add_runtime_dependency 'activerecord', '>= 6', '< 7' + spec.add_runtime_dependency 'activesupport', '>= 6', '< 7' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" From 6fa3a0b7315ec4bbeb939873a67a6abb1239e821 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:55:07 -0700 Subject: [PATCH 23/27] newest active record version does break --- knockoff.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/knockoff.gemspec b/knockoff.gemspec index e23aa79..1713cfd 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |spec| spec.bindir = "bin" spec.require_paths = ["lib"] - spec.add_runtime_dependency 'activerecord', '>= 6', '< 7' - spec.add_runtime_dependency 'activesupport', '>= 6', '< 7' + spec.add_runtime_dependency 'activerecord', '6.1.7.7' + spec.add_runtime_dependency 'activesupport', '6.1.7.7' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" From 6c347f7d0beba75cdd1f80ed2176862af2e74f2d Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:56:05 -0700 Subject: [PATCH 24/27] forgot to run bundle --- Gemfile.lock | 6 +++--- knockoff.gemspec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7432e39..9b3413d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,8 +2,8 @@ PATH remote: . specs: knockoff (1.4.0) - activerecord (= 6.1.7.7) - activesupport (= 6.1.7.7) + activerecord (>= 6, < 7) + activesupport (>= 6, < 7) GEM remote: https://rubygems.org/ @@ -61,7 +61,7 @@ DEPENDENCIES knockoff! rake (~> 10.0) rspec - sqlite3 (= 1.5.0) + sqlite3 (~> 1.5.0) BUNDLED WITH 2.5.17 diff --git a/knockoff.gemspec b/knockoff.gemspec index 1713cfd..e23aa79 100644 --- a/knockoff.gemspec +++ b/knockoff.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |spec| spec.bindir = "bin" spec.require_paths = ["lib"] - spec.add_runtime_dependency 'activerecord', '6.1.7.7' - spec.add_runtime_dependency 'activesupport', '6.1.7.7' + spec.add_runtime_dependency 'activerecord', '>= 6', '< 7' + spec.add_runtime_dependency 'activesupport', '>= 6', '< 7' spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" From 2592e167f43272e5c76ea9f65ecf31069d8ed0e9 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 15:58:56 -0700 Subject: [PATCH 25/27] revert bundler version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9b3413d..82e7432 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,4 +64,4 @@ DEPENDENCIES sqlite3 (~> 1.5.0) BUNDLED WITH - 2.5.17 + 2.4.22 From 966cd3a758cab576a4098c0bc790685ed13006e2 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Mon, 12 Aug 2024 16:00:48 -0700 Subject: [PATCH 26/27] Update activerecord --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 82e7432..a45e75e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,12 +8,12 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (6.1.7.7) - activesupport (= 6.1.7.7) - activerecord (6.1.7.7) - activemodel (= 6.1.7.7) - activesupport (= 6.1.7.7) - activesupport (6.1.7.7) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -38,12 +38,12 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - sqlite3 (1.5.0-aarch64-linux) - sqlite3 (1.5.0-arm-linux) - sqlite3 (1.5.0-arm64-darwin) - sqlite3 (1.5.0-x86-linux) - sqlite3 (1.5.0-x86_64-darwin) - sqlite3 (1.5.0-x86_64-linux) + sqlite3 (1.5.4-aarch64-linux) + sqlite3 (1.5.4-arm-linux) + sqlite3 (1.5.4-arm64-darwin) + sqlite3 (1.5.4-x86-linux) + sqlite3 (1.5.4-x86_64-darwin) + sqlite3 (1.5.4-x86_64-linux) tzinfo (2.0.6) concurrent-ruby (~> 1.0) zeitwerk (2.6.17) From d5d2dc006977b11b1f9476f79822251772bb8e25 Mon Sep 17 00:00:00 2001 From: David Kutalek Date: Tue, 13 Aug 2024 14:23:24 -0700 Subject: [PATCH 27/27] move changelog entry to top --- CHANGELOG.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4961f..6aa19ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Unreleased +## 1.4.0 + +Update to be Rails 6.1 compatible + ## 1.1.1 - Drop Ruby 2.3 support @@ -12,8 +16,3 @@ - Allow setting `Knockoff.default_target` to set the default target other than `:primary` (https://github.com/joinhandshake/knockoff/pull/11) - Drop Ruby 2.2 support - Add Ruby 2.5 support - -## 1.4.0 - -Update to be Rails 6.1 compatible -