Skip to content

feat(generator): update gem dependencies for generated clients #1294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
torreypayne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(generator): update gem dependencies for generated clients #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .kokoro/bazel-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ cat generator-versions.json
# try generating the google/example/library/v1 ruby gapic library
bazelisk build //google/example/library/v1:google-cloud-example-library-v1-ruby

# try generating the google/ads/googleads/v20 ruby gapic library
bazelisk build //google/ads/googleads/v20:googleads-ruby
# try generating the google/ads/googleads/v24 ruby gapic library
bazelisk build //google/ads/googleads/v24:googleads-ruby

popd
4 changes: 2 additions & 2 deletions gapic-generator-ads/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ GEM
google-cloud-common (1.10.0)
google-protobuf (>= 3.18, < 5.a)
googleapis-common-protos-types (~> 1.20)
google-protobuf (4.35.0-x86_64-linux-gnu)
google-protobuf (4.35.1-x86_64-linux-gnu)
bigdecimal
rake (~> 13.3)
google-style (1.32.0)
Expand All @@ -71,7 +71,7 @@ GEM
i18n (1.14.8)
concurrent-ruby (~> 1.0)
io-console (0.8.2)
json (2.19.8)
json (2.19.9)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator-cloud/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ GEM
google-cloud-common (1.10.0)
google-protobuf (>= 3.18, < 5.a)
googleapis-common-protos-types (~> 1.20)
google-protobuf (4.35.0-x86_64-linux-gnu)
google-protobuf (4.35.1-x86_64-linux-gnu)
bigdecimal
rake (~> 13.3)
google-style (1.32.0)
Expand All @@ -71,7 +71,7 @@ GEM
i18n (1.14.8)
concurrent-ruby (~> 1.0)
io-console (0.8.2)
json (2.19.8)
json (2.19.9)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
Expand Down
2 changes: 1 addition & 1 deletion gapic-generator-cloud/lib/gapic/presenters/cloud_gem_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def extra_files

def dependencies
deps = super
deps["google-cloud-errors"] = "~> 1.0"
deps["google-cloud-errors"] = "~> 1.6"
deps
end

Expand Down
2 changes: 1 addition & 1 deletion gapic-generator-cloud/lib/gapic/presenters/wrapper_gem_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def default_versioned_gem

def dependencies
@dependencies ||= begin
deps = { "google-cloud-core" => "~> 1.6" }
deps = { "google-cloud-core" => "~> 1.9" }
version_dependencies.each do |version, requirement|
# For pre-release dependencies on versioned clients, support both
# 0.x and 1.x versions to ease the transition to 1.0 (GA) releases
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator-cloud/templates/cloud/wrapper_gem/gemfile.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ local_dependencies.each do |name|
end

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
4 changes: 2 additions & 2 deletions gapic-generator/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GEM
google-cloud-common (1.10.0)
google-protobuf (>= 3.18, < 5.a)
googleapis-common-protos-types (~> 1.20)
google-protobuf (4.35.0-x86_64-linux-gnu)
google-protobuf (4.35.1-x86_64-linux-gnu)
bigdecimal
rake (~> 13.3)
google-style (1.32.0)
Expand All @@ -65,7 +65,7 @@ GEM
i18n (1.14.8)
concurrent-ruby (~> 1.0)
io-console (0.8.2)
json (2.19.8)
json (2.19.9)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator/lib/gapic/model/mixins.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ def services_in_config
# have these in lookup tables than to construct a ServicePresenter

SERVICE_TO_DEPENDENCY = {
LOCATIONS_SERVICE => { "google-cloud-location" => ["~> 1.0"] },
IAM_SERVICE => { "google-iam-v1" => ["~> 1.3"] }
LOCATIONS_SERVICE => { "google-cloud-location" => ["~> 1.5"] },
IAM_SERVICE => { "google-iam-v1" => ["~> 1.7"] }
}.freeze
private_constant :SERVICE_TO_DEPENDENCY

Expand Down
2 changes: 1 addition & 1 deletion gapic-generator/lib/gapic/presenters/sample_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def initialize field
@value = convert field["value"]
@input_parameter = field["input_parameter"]
@comment = field["comment"]
@comment = nil if @comment&.empty?
@comment = nil if @comment && @comment.empty?
@value_is_file = field["value_is_file"]
end

Expand Down
2 changes: 1 addition & 1 deletion gapic-generator/lib/gapic/presenters/snippet/parameter_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ParameterPresenter
def initialize proto, json
@name = proto.name
@description = proto.description
@description = nil if @description&.empty?
@description = nil if @description && @description.empty?
@type = TypePresenter.new proto&.type, json&.fetch("type", nil)
@example = ExpressionPresenter.new proto&.value, json&.fetch("value", nil)
end
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator/templates/default/gem/gemfile.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
6 changes: 3 additions & 3 deletions gapic-generator/templates/default/snippets/gemfile.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ else
end

group :test do
gem "google-style", "~> 1.26.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
gem "google-style", "~> 1.32.0"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-hooks", "~> 1.5"
end
3 changes: 2 additions & 1 deletion shared/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ gem "google-cloud-location", ">= 0.4", "< 2.a"
gem "google-iam-v1", ">= 0.4", "< 2.a"

gem "grpc-tools", ">= 1.60.0", "< 1.75.1"
gem "minitest", "~> 5.16"
gem "minitest", "~> 6.0.2"
gem "minitest-autotest", "~> 1.0"
gem "minitest-focus", "~> 1.0"
gem "minitest-mock", "~> 5.27"
gem "ostruct", "0.6.3"
gem "rake", ">= 12.0"
4 changes: 2 additions & 2 deletions shared/output/cloud/compute_small/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/compute_small/google-cloud-compute-v1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ Gem::Specification.new do |gem|

gem.add_dependency "gapic-common", ">= 1.1", "< 2.a"
gem.add_dependency "google-cloud-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.6"
end
6 changes: 3 additions & 3 deletions shared/output/cloud/compute_small/snippets/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else
end

group :test do
gem "google-style", "~> 1.26.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
gem "google-style", "~> 1.32.0"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-hooks", "~> 1.5"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/compute_small_wrapper/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ local_dependencies.each do |name|
end

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/compute_small_wrapper/google-cloud-compute.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
gem.add_dependency "gapic-common", ">= 1.1", "< 2.a"
gem.add_dependency "google-cloud-common", "~> 1.0"
gem.add_dependency "google-cloud-compute-v1", ">= 0.0", "< 2.a"
gem.add_dependency "google-cloud-core", "~> 1.6"
gem.add_dependency "google-cloud-core", "~> 1.9"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/grafeas_v1/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/grafeas_v1/grafeas-v1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = ">= 3.2"

gem.add_dependency "gapic-common", "~> 1.3"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.6"
end
6 changes: 3 additions & 3 deletions shared/output/cloud/grafeas_v1/snippets/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else
end

group :test do
gem "google-style", "~> 1.26.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
gem "google-style", "~> 1.32.0"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-hooks", "~> 1.5"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/language_v1/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/language_v1/google-cloud-language-v1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = ">= 3.2"

gem.add_dependency "gapic-common", "~> 1.3"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.6"
end
6 changes: 3 additions & 3 deletions shared/output/cloud/language_v1/snippets/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else
end

group :test do
gem "google-style", "~> 1.26.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
gem "google-style", "~> 1.32.0"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-hooks", "~> 1.5"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/language_v1beta1/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = ">= 3.2"

gem.add_dependency "gapic-common", "~> 1.3"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.6"
end
6 changes: 3 additions & 3 deletions shared/output/cloud/language_v1beta1/snippets/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else
end

group :test do
gem "google-style", "~> 1.26.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
gem "google-style", "~> 1.32.0"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-hooks", "~> 1.5"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/language_v1beta2/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = ">= 3.2"

gem.add_dependency "gapic-common", "~> 1.3"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.6"
end
6 changes: 3 additions & 3 deletions shared/output/cloud/language_v1beta2/snippets/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else
end

group :test do
gem "google-style", "~> 1.26.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
gem "google-style", "~> 1.32.0"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-hooks", "~> 1.5"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/language_wrapper/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ local_dependencies.each do |name|
end

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
2 changes: 1 addition & 1 deletion shared/output/cloud/language_wrapper/google-cloud-language.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.2"

gem.add_dependency "google-cloud-core", "~> 1.6"
gem.add_dependency "google-cloud-core", "~> 1.9"
gem.add_dependency "google-cloud-language-v1", ">= 0.0", "< 2.a"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/location/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ source "https://rubygems.org"
gemspec

gem "google-style", "~> 1.32.0"
gem "irb", "~> 1.17"
gem "irb", "~> 1.18"
gem "minitest", "~> 6.0.2"
gem "minitest-focus", "~> 1.4"
gem "minitest-mock", "~> 5.27"
gem "minitest-rg", "~> 5.3"
gem "ostruct", "~> 0.5.5"
gem "ostruct", "~> 0.6.0"
gem "rake", ">= 13.0"
gem "redcarpet", "~> 3.6"
gem "yard", "~> 0.9"
Loading
Loading