Skip to content

Commit 10160a9

Browse files
committed
Upgrade the GraphQL gem to 2.6.2.
This lets us drop our `jruby_patches.rb` file in `elasticgraph-graphql` since the bug we reported got fixed: rmosolgo/graphql-ruby#5541
1 parent 98eb9fa commit 10160a9

7 files changed

Lines changed: 10 additions & 46 deletions

File tree

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PATH
5353
apollo-federation (~> 3.10, >= 3.10.3)
5454
elasticgraph-graphql (= 1.1.1.pre)
5555
elasticgraph-support (= 1.1.1.pre)
56-
graphql (~> 2.6.1)
56+
graphql (~> 2.6.2)
5757

5858
PATH
5959
remote: elasticgraph-datastore_core
@@ -91,7 +91,7 @@ PATH
9191
base64 (~> 0.3)
9292
elasticgraph-datastore_core (= 1.1.1.pre)
9393
elasticgraph-schema_artifacts (= 1.1.1.pre)
94-
graphql (~> 2.6.1)
94+
graphql (~> 2.6.2)
9595

9696
PATH
9797
remote: elasticgraph-health_check
@@ -170,7 +170,7 @@ PATH
170170
elasticgraph-query_registry (1.1.1.pre)
171171
elasticgraph-graphql (= 1.1.1.pre)
172172
elasticgraph-support (= 1.1.1.pre)
173-
graphql (~> 2.6.1)
173+
graphql (~> 2.6.2)
174174
rake (~> 13.4, >= 13.4.2)
175175

176176
PATH
@@ -194,7 +194,7 @@ PATH
194194
elasticgraph-indexer (= 1.1.1.pre)
195195
elasticgraph-schema_artifacts (= 1.1.1.pre)
196196
elasticgraph-support (= 1.1.1.pre)
197-
graphql (~> 2.6.1)
197+
graphql (~> 2.6.2)
198198
rake (~> 13.4, >= 13.4.2)
199199

200200
PATH
@@ -366,7 +366,7 @@ GEM
366366
ffi (~> 1)
367367
ffi-compiler (~> 1)
368368
rake (~> 13.3)
369-
graphql (2.6.1)
369+
graphql (2.6.2)
370370
base64
371371
fiber-storage
372372
logger
@@ -832,7 +832,7 @@ CHECKSUMS
832832
google-protobuf (4.34.1) sha256=347181542b8d659c60f028fa3791c9cccce651a91ad27782dbc5c5e374796cdc
833833
google-protobuf (4.34.1-arm64-darwin) sha256=2745061f973119e6e7f3c81a0c77025d291a3caa6585a2cd24a25bbc7bedb267
834834
google-protobuf (4.34.1-java) sha256=b61f7f754842171af103130b94c72760888be271ce8cf79cdb1913e8f5674c5e
835-
graphql (2.6.1) sha256=e4b4290dda309fcfba2df38cacf4ee67e2194e06f09b9efbd7738f1df7e41967
835+
graphql (2.6.2) sha256=42971edc2281c963cb94b4fcef4897ff7ffe3a52c4467706df6fe0531f1b4858
836836
graphql-c_parser (1.1.3) sha256=a0a7e3221c091285ca03987de50ba8ad49846f66748b5fdd3780729482bbc358
837837
hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d
838838
hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1

elasticgraph-apollo/elasticgraph-apollo.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
4343

4444
spec.add_dependency "elasticgraph-graphql", ElasticGraph::VERSION
4545
spec.add_dependency "elasticgraph-support", ElasticGraph::VERSION
46-
spec.add_dependency "graphql", "~> 2.6.1"
46+
spec.add_dependency "graphql", "~> 2.6.2"
4747
spec.add_dependency "apollo-federation", "~> 3.10", ">= 3.10.3"
4848

4949
# Note: technically, this is not purely a development dependency, but since `eg-schema_def`

elasticgraph-graphql/elasticgraph-graphql.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
4444
spec.add_dependency "base64", "~> 0.3"
4545
spec.add_dependency "elasticgraph-datastore_core", ElasticGraph::VERSION
4646
spec.add_dependency "elasticgraph-schema_artifacts", ElasticGraph::VERSION
47-
spec.add_dependency "graphql", "~> 2.6.1"
47+
spec.add_dependency "graphql", "~> 2.6.2"
4848

4949
spec.add_development_dependency "elasticgraph-admin", ElasticGraph::VERSION
5050
spec.add_development_dependency "elasticgraph-elasticsearch", ElasticGraph::VERSION

elasticgraph-graphql/lib/elastic_graph/graphql/jruby_patches.rb

Lines changed: 0 additions & 32 deletions
This file was deleted.

elasticgraph-graphql/lib/elastic_graph/graphql/resolvers/nested_relationships_source.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
require "elastic_graph/graphql/resolvers/query_source"
1010

11-
# :nocov:
12-
require "elastic_graph/graphql/jruby_patches" if RUBY_ENGINE == "jruby"
13-
# :nocov:
14-
1511
module ElasticGraph
1612
class GraphQL
1713
module Resolvers

elasticgraph-query_registry/elasticgraph-query_registry.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
4343

4444
spec.add_dependency "elasticgraph-graphql", ElasticGraph::VERSION
4545
spec.add_dependency "elasticgraph-support", ElasticGraph::VERSION
46-
spec.add_dependency "graphql", "~> 2.6.1"
46+
spec.add_dependency "graphql", "~> 2.6.2"
4747
spec.add_dependency "rake", "~> 13.4", ">= 13.4.2"
4848

4949
spec.add_development_dependency "elasticgraph-elasticsearch", ElasticGraph::VERSION

elasticgraph-schema_definition/elasticgraph-schema_definition.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
4545
spec.add_dependency "elasticgraph-indexer", ElasticGraph::VERSION # needed since we validate that scalar `prepare_for_indexing_with` options are valid (which loads indexing preparer adapters)
4646
spec.add_dependency "elasticgraph-schema_artifacts", ElasticGraph::VERSION
4747
spec.add_dependency "elasticgraph-support", ElasticGraph::VERSION
48-
spec.add_dependency "graphql", "~> 2.6.1"
48+
spec.add_dependency "graphql", "~> 2.6.2"
4949
spec.add_dependency "rake", "~> 13.4", ">= 13.4.2"
5050

5151
spec.add_development_dependency "elasticgraph-admin", ElasticGraph::VERSION

0 commit comments

Comments
 (0)