Skip to content

feat: Update common dependencies for generated clients #1177

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

Merged
dazuma merged 2 commits into from
May 1, 2025
Merged

feat: Update common dependencies for generated clients #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6176cb
feat: Update common dependencies for generated clients
dazuma Apr 30, 2025
ff4e94e
Merge branch 'main' into pr/common26
dazuma May 1, 2025
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 gapic-generator/lib/gapic/model/mixins.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ def services_in_config
# have these in lookup tables than to construct a ServicePresenter

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

Expand Down
4 changes: 2 additions & 2 deletions gapic-generator/lib/gapic/presenters/gem_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ def extra_files

def dependencies
@dependencies ||= begin
deps = { "gapic-common" => [">= 0.25.0", "< 2.a"] }
deps["grpc-google-iam-v1"] = "~> 1.1" if iam_dependency?
deps = { "gapic-common" => "~> 1.0" }
deps["grpc-google-iam-v1"] = "~> 1.11" if iam_dependency?
extra_deps = gem_config_dependencies
deps.merge! mixins_model.dependencies if mixins_model.mixins?
# extra deps should be last, overriding mixins or defaults
Expand Down
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 @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
end
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 @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
end
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 @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
end
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 @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
end
2 changes: 1 addition & 1 deletion shared/output/cloud/location/google-cloud-location.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/secretmanager_v1beta1/google-cloud-secret_manager-v1beta1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "grpc-google-iam-v1", "~> 1.1"
gem.add_dependency "grpc-google-iam-v1", "~> 1.11"
end
2 changes: 1 addition & 1 deletion shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
end
4 changes: 2 additions & 2 deletions shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-errors", "~> 1.0"
gem.add_dependency "google-cloud-location", ">= 0.7", "< 2.a"
gem.add_dependency "google-cloud-location", "~> 1.0"
end
4 changes: 2 additions & 2 deletions shared/output/gapic/templates/garbage/google-garbage.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "grpc-google-iam-v1", "~> 1.1"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "grpc-google-iam-v1", "~> 1.11"
end
2 changes: 1 addition & 1 deletion shared/output/gapic/templates/noservice/google-garbage-noservice.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
end
6 changes: 3 additions & 3 deletions shared/output/gapic/templates/showcase/google-showcase.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "google-cloud-location", ">= 0.7", "< 2.a"
gem.add_dependency "google-iam-v1", ">= 0.7", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-location", "~> 1.0"
gem.add_dependency "google-iam-v1", "~> 1.3"
end
4 changes: 2 additions & 2 deletions shared/output/gapic/templates/testing/testing.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 3.1"

gem.add_dependency "gapic-common", ">= 0.25.0", "< 2.a"
gem.add_dependency "gapic-common", "~> 1.0"
gem.add_dependency "google-cloud-common", "~> 1.0"
gem.add_dependency "google-cloud-location", ">= 0.7", "< 2.a"
gem.add_dependency "google-cloud-location", "~> 1.0"
end