From a433262539e255c03fd7217242b35fd099cb5fb9 Mon Sep 17 00:00:00 2001 From: hschne Date: Mon, 28 Oct 2024 18:47:55 +0100 Subject: [PATCH] Update dependencies --- .github/workflows/build.yml | 4 +- .ruby-version | 1 + Gemfile.lock | 79 +++++++++++++++++----------- graphql-groups.gemspec | 8 +-- lib/graphql/groups/has_aggregates.rb | 4 +- 5 files changed, 56 insertions(+), 40 deletions(-) create mode 100644 .ruby-version diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed80fd4..92e6da2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,9 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.1.0 - name: Install dependencies run: bundle install - name: Run tests diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..8c50098 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.1 diff --git a/Gemfile.lock b/Gemfile.lock index 6fe97de..a6fc3c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,56 @@ PATH remote: . specs: - graphql-groups (0.2.2) + graphql-groups (0.2.3) graphql (> 1.9) GEM remote: https://rubygems.org/ specs: - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) - activesupport (6.1.6.1) - concurrent-ruby (~> 1.0, >= 1.0.2) + activemodel (7.2.1.2) + activesupport (= 7.2.1.2) + activerecord (7.2.1.2) + activemodel (= 7.2.1.2) + activesupport (= 7.2.1.2) + timeout (>= 0.4.0) + activesupport (7.2.1.2) + base64 + 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) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ast (2.4.1) + base64 (0.2.0) benchmark-ips (2.8.2) - concurrent-ruby (1.1.10) - database_cleaner (1.8.5) - database_cleaner-active_record (1.8.0) - activerecord - database_cleaner (~> 1.8.0) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + database_cleaner-active_record (2.2.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) diff-lcs (1.4.4) - docile (1.4.0) + docile (1.4.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) + drb (2.2.1) + fiber-storage (1.0.0) gqli (1.0.0) hashie (~> 3.0) http (> 0.8, < 3.0) multi_json (~> 1) - graphql (2.0.15) - groupdate (5.2.1) - activesupport (>= 5) + graphql (2.3.19) + base64 + fiber-storage + groupdate (6.5.1) + activesupport (>= 7) gruff (0.10.0) histogram rmagick @@ -52,9 +65,11 @@ GEM domain_name (~> 0.5) http-form_data (1.0.3) http_parser.rb (0.6.0) - i18n (1.11.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - minitest (5.16.2) + logger (1.6.1) + mini_portile2 (2.8.7) + minitest (5.25.1) multi_json (1.15.0) parallel (1.19.2) parser (2.7.1.4) @@ -93,40 +108,42 @@ GEM rubocop-rspec (1.42.0) rubocop (>= 0.87.0) ruby-progressbar (1.10.1) - simplecov (0.21.2) + securerandom (0.3.1) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - sqlite3 (1.4.2) + sqlite3 (2.1.1) + mini_portile2 (~> 2.8.0) strscan (3.1.0) - tzinfo (2.0.4) + timeout (0.4.1) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) - zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES - activerecord (~> 6.0) + activerecord (~> 7.2) benchmark-ips (~> 2.8) bundler (~> 2.0) - database_cleaner-active_record (~> 1.8) + database_cleaner-active_record (~> 2.1) gqli (~> 1.0) graphql-groups! - groupdate (~> 5.2.1) + groupdate (~> 6.5.1) gruff (~> 0.10) rake (~> 13.0) rspec (~> 3.0) rubocop (~> 0.88) rubocop-rspec (~> 1.42) - simplecov (~> 0.21.2) - sqlite3 (~> 1.4.2) + simplecov (~> 0.22) + sqlite3 (~> 2.1.1) BUNDLED WITH 2.3.16 diff --git a/graphql-groups.gemspec b/graphql-groups.gemspec index 0ece078..b5ae7ab 100644 --- a/graphql-groups.gemspec +++ b/graphql-groups.gemspec @@ -33,19 +33,19 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0') - spec.add_development_dependency 'activerecord', '~> 6.0' + spec.add_development_dependency 'activerecord', '~> 7.2' spec.add_development_dependency 'benchmark-ips', '~> 2.8' spec.add_development_dependency 'bundler', '~> 2.0' - spec.add_development_dependency 'database_cleaner-active_record', '~> 1.8' + spec.add_development_dependency 'database_cleaner-active_record', '~> 2.1' spec.add_development_dependency 'gqli', '~> 1.0' - spec.add_development_dependency 'groupdate', '~> 5.2.1' + spec.add_development_dependency 'groupdate', '~> 6.5.1' spec.add_development_dependency 'gruff', '~> 0.10' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'rubocop', '~> 0.88' spec.add_development_dependency 'rubocop-rspec', '~> 1.42' spec.add_development_dependency 'simplecov', '~> 0.22' - spec.add_development_dependency 'sqlite3', '~> 1.4.2' + spec.add_development_dependency 'sqlite3', '~> 2.1.1' spec.add_dependency 'graphql', '> 1.9' end diff --git a/lib/graphql/groups/has_aggregates.rb b/lib/graphql/groups/has_aggregates.rb index 5466396..23fcc34 100644 --- a/lib/graphql/groups/has_aggregates.rb +++ b/lib/graphql/groups/has_aggregates.rb @@ -15,7 +15,7 @@ def aggregate(name, *_, **options, &block) query_method = options[:query_method] || name field = aggregate_field name, aggregate_type, null: false, - query_method: query_method, + query_method:, resolver_method: resolve_method, **options, &block aggregate_type.add_fields(field.own_attributes) @@ -31,7 +31,7 @@ def aggregate(name, *_, **options, &block) def aggregate_field(*args, **kwargs, &block) field_defn = Schema::AggregateField.from_options(*args, owner: self, **kwargs, &block) - field_defn.ensure_loaded + field_defn.ensure_loaded if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.3') add_field(field_defn) field_defn end