From dc0f5db9169091eb0dcabd254a117f2a0852bf4f Mon Sep 17 00:00:00 2001 From: Willian van der Velde Date: Mon, 27 Sep 2021 10:49:22 +0200 Subject: [PATCH 1/3] Add AR 6.1 to appraisals --- Appraisals | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Appraisals b/Appraisals index 09038ec2..236ef7d4 100644 --- a/Appraisals +++ b/Appraisals @@ -11,3 +11,8 @@ end appraise 'active_record_6' do gem 'activerecord', '~> 6.0.0' end + +appraise 'active_record_6' do + gem 'activerecord', '~> 6.1.0' +end + From b552100ca6d50f806e8be5a9111778075f92bfe6 Mon Sep 17 00:00:00 2001 From: Willian van der Velde Date: Wed, 29 Sep 2021 09:09:28 +0200 Subject: [PATCH 2/3] fix --- Appraisals | 2 +- Gemfile.lock | 73 ++++++++++++++------------- arel_toolkit.gemspec | 2 +- gemfiles/active_record_6.gemfile.lock | 4 +- gemfiles/arel_gems.gemfile.lock | 4 +- gemfiles/default.gemfile.lock | 4 +- 6 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Appraisals b/Appraisals index 236ef7d4..bcd16d35 100644 --- a/Appraisals +++ b/Appraisals @@ -12,7 +12,7 @@ appraise 'active_record_6' do gem 'activerecord', '~> 6.0.0' end -appraise 'active_record_6' do +appraise 'active_record_6_1' do gem 'activerecord', '~> 6.1.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 8fc9f768..eacdfe2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,24 +2,24 @@ PATH remote: . specs: arel_toolkit (0.4.6) - activerecord (>= 5.0.0, < 6.0.4) + activerecord (>= 5.0.0) pg (~> 1.1.4) pg_query (~> 2.1) GEM remote: https://rubygems.org/ specs: - activemodel (6.0.3.7) - activesupport (= 6.0.3.7) - activerecord (6.0.3.7) - activemodel (= 6.0.3.7) - activesupport (= 6.0.3.7) - activesupport (6.0.3.7) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ansi (1.5.0) @@ -31,24 +31,24 @@ GEM nokogiri (~> 1.8) thor (~> 1.0) ast (2.4.2) - async (1.29.1) + async (1.30.1) console (~> 1.10) nio4r (~> 2.3) timers (~> 4.1) - async-http (0.56.3) - async (~> 1.25) - async-io (~> 1.28) - async-pool (~> 0.2) + async-http (0.56.5) + async (>= 1.25) + async-io (>= 1.28) + async-pool (>= 0.2) protocol-http (~> 0.22.0) protocol-http1 (~> 0.14.0) protocol-http2 (~> 0.14.0) async-http-faraday (0.11.0) async-http (~> 0.42) faraday - async-io (1.32.1) - async (~> 1.14) - async-pool (0.3.7) - async (~> 1.25) + async-io (1.32.2) + async + async-pool (0.3.8) + async (>= 1.25) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) coderay (1.1.3) @@ -60,7 +60,7 @@ GEM diff-lcs (1.4.4) docile (1.4.0) dpl (1.10.16) - faraday (1.5.1) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -68,6 +68,7 @@ GEM faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) @@ -79,7 +80,8 @@ GEM faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) - ffi (1.15.3) + faraday-rack (1.0.0) + ffi (1.15.4) fiber-local (1.0.0) formatador (0.3.0) github_changelog_generator (1.16.4) @@ -91,7 +93,7 @@ GEM octokit (~> 4.6) rainbow (>= 2.2.1) rake (>= 10.0) - google-protobuf (3.17.3) + google-protobuf (3.18.0) guard (2.17.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -118,20 +120,20 @@ GEM interception (0.5) jaro_winkler (1.5.4) json (2.5.1) - listen (3.5.1) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lumberjack (1.2.8) memory_profiler (0.9.14) method_source (0.9.2) - mini_portile2 (2.5.3) + mini_portile2 (2.6.1) minitest (5.14.4) multi_json (1.15.0) multipart-post (2.1.1) nenv (0.3.0) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.4) + mini_portile2 (~> 2.6.1) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -139,7 +141,7 @@ GEM octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.20.1) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) pg (1.1.4) @@ -147,7 +149,7 @@ GEM google-protobuf (>= 3.17.1) protocol-hpack (1.4.2) protocol-http (0.22.5) - protocol-http1 (0.14.1) + protocol-http1 (0.14.2) protocol-http (~> 0.22) protocol-http2 (0.14.2) protocol-hpack (~> 1.4) @@ -158,7 +160,7 @@ GEM pry-alias (0.0.1) binding_of_caller pry - pry-doc (1.1.0) + pry-doc (1.2.0) pry (~> 0.11) yard (~> 0.9.11) pry-nav (0.3.0) @@ -199,7 +201,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.11.0) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -215,10 +217,9 @@ GEM simplecov-html (0.10.2) stackprof (0.2.17) thor (1.1.0) - thread_safe (0.3.6) timers (4.3.3) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) unicode-display_width (1.6.1) yard (0.9.26) zeitwerk (2.4.2) @@ -254,4 +255,4 @@ DEPENDENCIES stackprof (~> 0.2) BUNDLED WITH - 2.2.23 + 2.2.28 diff --git a/arel_toolkit.gemspec b/arel_toolkit.gemspec index 38d62b99..d16e0ff5 100644 --- a/arel_toolkit.gemspec +++ b/arel_toolkit.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.extensions = ['ext/pg_result_init/extconf.rb'] - spec.add_dependency 'activerecord', '>= 5.0.0', '< 6.0.4' + spec.add_dependency 'activerecord', '>= 5.0.0' spec.add_dependency 'pg', '~> 1.1.4' spec.add_dependency 'pg_query', '~> 2.1' diff --git a/gemfiles/active_record_6.gemfile.lock b/gemfiles/active_record_6.gemfile.lock index 485395b0..670f55f6 100644 --- a/gemfiles/active_record_6.gemfile.lock +++ b/gemfiles/active_record_6.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: arel_toolkit (0.4.6) - activerecord (>= 5.0.0, < 6.0.4) + activerecord (>= 5.0.0) pg (~> 1.1.4) pg_query (~> 2.1) @@ -209,4 +209,4 @@ DEPENDENCIES stackprof (~> 0.2) BUNDLED WITH - 2.2.23 + 2.2.28 diff --git a/gemfiles/arel_gems.gemfile.lock b/gemfiles/arel_gems.gemfile.lock index 125f4538..150145b7 100644 --- a/gemfiles/arel_gems.gemfile.lock +++ b/gemfiles/arel_gems.gemfile.lock @@ -32,7 +32,7 @@ PATH remote: .. specs: arel_toolkit (0.4.6) - activerecord (>= 5.0.0, < 6.0.4) + activerecord (>= 5.0.0) pg (~> 1.1.4) pg_query (~> 2.1) @@ -283,4 +283,4 @@ DEPENDENCIES stackprof (~> 0.2) BUNDLED WITH - 2.2.23 + 2.2.28 diff --git a/gemfiles/default.gemfile.lock b/gemfiles/default.gemfile.lock index 0f04a9c7..de9e836e 100644 --- a/gemfiles/default.gemfile.lock +++ b/gemfiles/default.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: arel_toolkit (0.4.6) - activerecord (>= 5.0.0, < 6.0.4) + activerecord (>= 5.0.0) pg (~> 1.1.4) pg_query (~> 2.1) @@ -207,4 +207,4 @@ DEPENDENCIES stackprof (~> 0.2) BUNDLED WITH - 2.2.23 + 2.2.28 From 400d3e0cb238dcdd63e466869c0c27e34095b3ee Mon Sep 17 00:00:00 2001 From: Willian van der Velde Date: Wed, 29 Sep 2021 10:18:11 +0200 Subject: [PATCH 3/3] Lock files --- gemfiles/active_record_6_1.gemfile | 7 + gemfiles/active_record_6_1.gemfile.lock | 259 ++++++++++++++++++++++++ 2 files changed, 266 insertions(+) create mode 100644 gemfiles/active_record_6_1.gemfile create mode 100644 gemfiles/active_record_6_1.gemfile.lock diff --git a/gemfiles/active_record_6_1.gemfile b/gemfiles/active_record_6_1.gemfile new file mode 100644 index 00000000..07548db0 --- /dev/null +++ b/gemfiles/active_record_6_1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activerecord", "~> 6.1.0" + +gemspec path: "../" diff --git a/gemfiles/active_record_6_1.gemfile.lock b/gemfiles/active_record_6_1.gemfile.lock new file mode 100644 index 00000000..0e7d3b16 --- /dev/null +++ b/gemfiles/active_record_6_1.gemfile.lock @@ -0,0 +1,259 @@ +PATH + remote: .. + specs: + arel_toolkit (0.4.6) + activerecord (>= 5.0.0) + pg (~> 1.1.4) + pg_query (~> 2.1) + +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + ansi (1.5.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + approvals (0.0.25) + nokogiri (~> 1.8) + thor (~> 1.0) + ast (2.4.2) + async (1.30.1) + console (~> 1.10) + nio4r (~> 2.3) + timers (~> 4.1) + async-http (0.56.5) + async (>= 1.25) + async-io (>= 1.28) + async-pool (>= 0.2) + protocol-http (~> 0.22.0) + protocol-http1 (~> 0.14.0) + protocol-http2 (~> 0.14.0) + async-http-faraday (0.11.0) + async-http (~> 0.42) + faraday + async-io (1.32.2) + async + async-pool (0.3.8) + async (>= 1.25) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + coderay (1.1.3) + concurrent-ruby (1.1.9) + console (1.13.1) + fiber-local + database_cleaner (1.7.0) + debug_inspector (1.1.0) + diff-lcs (1.4.4) + docile (1.4.0) + dpl (1.10.16) + faraday (1.8.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-http-cache (2.2.0) + faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + ffi (1.15.4) + fiber-local (1.0.0) + formatador (0.3.0) + github_changelog_generator (1.16.4) + activesupport + async (>= 1.25.0) + async-http-faraday + faraday-http-cache + multi_json + octokit (~> 4.6) + rainbow (>= 2.2.1) + rake (>= 10.0) + google-protobuf (3.18.0) + guard (2.17.0) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rake (1.0.0) + guard + rake + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + guard-rubocop (1.3.0) + guard (~> 2.0) + rubocop (~> 0.20) + hirb (0.7.3) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + interception (0.5) + jaro_winkler (1.5.4) + json (2.5.1) + listen (3.7.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + lumberjack (1.2.8) + memory_profiler (0.9.14) + method_source (0.9.2) + mini_portile2 (2.6.1) + minitest (5.14.4) + multi_json (1.15.0) + multipart-post (2.1.1) + nenv (0.3.0) + nio4r (2.5.8) + nokogiri (1.12.4) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + octokit (4.21.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) + parallel (1.21.0) + parser (3.0.2.0) + ast (~> 2.4.1) + pg (1.1.4) + pg_query (2.1.0) + google-protobuf (>= 3.17.1) + protocol-hpack (1.4.2) + protocol-http (0.22.5) + protocol-http1 (0.14.2) + protocol-http (~> 0.22) + protocol-http2 (0.14.2) + protocol-hpack (~> 1.4) + protocol-http (~> 0.18) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-alias (0.0.1) + binding_of_caller + pry + pry-doc (1.2.0) + pry (~> 0.11) + yard (~> 0.9.11) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rescue (1.5.2) + interception (>= 0.5) + pry (>= 0.12.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (4.0.6) + racc (1.5.2) + rainbow (3.0.0) + rake (13.0.6) + rake-compiler (1.1.1) + rake + rb-fsevent (0.11.0) + rb-inotify (0.10.1) + ffi (~> 1.0) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (0.71.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + shellany (0.0.1) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-console (0.4.2) + ansi + hirb + simplecov + simplecov-html (0.10.2) + stackprof (0.2.17) + thor (1.1.0) + timers (4.3.3) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + unicode-display_width (1.6.1) + yard (0.9.26) + zeitwerk (2.4.2) + +PLATFORMS + aarch64-linux + +DEPENDENCIES + activerecord (~> 6.1.0) + appraisal (~> 2.4.1) + approvals (~> 0.0.24) + arel_toolkit! + bundler (~> 2.0) + database_cleaner (~> 1.7.0) + dpl (~> 1.10.11) + github_changelog_generator (~> 1.15) + guard (~> 2.15) + guard-rake (~> 1.0.0) + guard-rspec (~> 4.7) + guard-rubocop (~> 1.3.0) + memory_profiler (~> 0.9) + pry + pry-alias + pry-doc + pry-nav + pry-rescue + pry-stack_explorer + rake (~> 13.0) + rake-compiler (~> 1.0) + rspec (~> 3.8) + rubocop (= 0.71.0) + simplecov (~> 0.16.1) + simplecov-console (~> 0.4.2) + stackprof (~> 0.2) + +BUNDLED WITH + 2.2.28