Skip to content

Commit 2deda45

Browse files
authored
feat: update google-protobuf (#291)
* Try new protobuf * Cop * Bump version
1 parent afa5ce2 commit 2deda45

File tree

5 files changed

+61
-299
lines changed

5 files changed

+61
-299
lines changed

.rubocop.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AllCops:
77
- 'node_modules/**/*'
88
- 'gemfiles/**/*'
99
- 'vendor/**/*'
10+
- lib/apollo-federation/tracing/proto/apollo_pb.rb
1011

1112
#
1213
# We prefer trailing commas so that the git diff is reduced when adding elements

Gemfile.lock

+16-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
apollo-federation (3.9.0)
5-
google-protobuf (~> 3.22)
5+
google-protobuf (< 5)
66
graphql
77

88
GEM
@@ -28,6 +28,7 @@ GEM
2828
tzinfo (~> 2.0)
2929
ast (2.4.2)
3030
base64 (0.2.0)
31+
bigdecimal (3.1.9)
3132
builder (3.2.4)
3233
byebug (11.1.3)
3334
coderay (1.1.3)
@@ -39,7 +40,15 @@ GEM
3940
reline (>= 0.3.8)
4041
diff-lcs (1.5.0)
4142
erubi (1.12.0)
42-
google-protobuf (3.22.2)
43+
google-protobuf (4.29.3-arm64-darwin)
44+
bigdecimal
45+
rake (>= 13)
46+
google-protobuf (4.29.3-x86_64-darwin)
47+
bigdecimal
48+
rake (>= 13)
49+
google-protobuf (4.29.3-x86_64-linux)
50+
bigdecimal
51+
rake (>= 13)
4352
graphql (2.0.31)
4453
base64
4554
i18n (1.12.0)
@@ -54,11 +63,13 @@ GEM
5463
crass (~> 1.0.2)
5564
nokogiri (>= 1.5.9)
5665
method_source (1.1.0)
57-
mini_portile2 (2.8.8)
5866
minitest (5.18.0)
5967
mutex_m (0.3.0)
60-
nokogiri (1.14.2)
61-
mini_portile2 (~> 2.8.0)
68+
nokogiri (1.18.2-arm64-darwin)
69+
racc (~> 1.4)
70+
nokogiri (1.18.2-x86_64-darwin)
71+
racc (~> 1.4)
72+
nokogiri (1.18.2-x86_64-linux-gnu)
6273
racc (~> 1.4)
6374
ostruct (0.6.1)
6475
parallel (1.22.1)

apollo-federation.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
2828

2929
spec.add_dependency 'graphql'
3030

31-
spec.add_runtime_dependency 'google-protobuf', '~> 3.22'
31+
spec.add_runtime_dependency 'google-protobuf', '< 5'
3232

3333
spec.add_development_dependency 'actionpack'
3434
spec.add_development_dependency 'debug'

lib/apollo-federation/tracing/proto/apollo_pb.rb

+42-292
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/apollo-federation/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module ApolloFederation
4-
VERSION = '3.9.0'
4+
VERSION = '4.0.0'
55
end

0 commit comments

Comments
 (0)