diff --git a/gapic-generator/lib/gapic/model/mixins.rb b/gapic-generator/lib/gapic/model/mixins.rb index 17f139533..1183b4833 100644 --- a/gapic-generator/lib/gapic/model/mixins.rb +++ b/gapic-generator/lib/gapic/model/mixins.rb @@ -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 diff --git a/gapic-generator/lib/gapic/presenters/gem_presenter.rb b/gapic-generator/lib/gapic/presenters/gem_presenter.rb index ffe4bbd0c..fb644df62 100644 --- a/gapic-generator/lib/gapic/presenters/gem_presenter.rb +++ b/gapic-generator/lib/gapic/presenters/gem_presenter.rb @@ -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 diff --git a/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec b/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec index 0cb35c41a..28f45c393 100644 --- a/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec +++ b/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec @@ -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 diff --git a/shared/output/cloud/language_v1/google-cloud-language-v1.gemspec b/shared/output/cloud/language_v1/google-cloud-language-v1.gemspec index c0154a5ea..00816bc2b 100644 --- a/shared/output/cloud/language_v1/google-cloud-language-v1.gemspec +++ b/shared/output/cloud/language_v1/google-cloud-language-v1.gemspec @@ -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 diff --git a/shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec b/shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec index d1a792d96..23b8ccc03 100644 --- a/shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec +++ b/shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec @@ -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 diff --git a/shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec b/shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec index 40e421950..91eed67cb 100644 --- a/shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec +++ b/shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec @@ -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 diff --git a/shared/output/cloud/location/google-cloud-location.gemspec b/shared/output/cloud/location/google-cloud-location.gemspec index 66d5c6d21..e11cd7f23 100644 --- a/shared/output/cloud/location/google-cloud-location.gemspec +++ b/shared/output/cloud/location/google-cloud-location.gemspec @@ -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 diff --git a/shared/output/cloud/secretmanager_v1beta1/google-cloud-secret_manager-v1beta1.gemspec b/shared/output/cloud/secretmanager_v1beta1/google-cloud-secret_manager-v1beta1.gemspec index 5d8716843..296e1104f 100644 --- a/shared/output/cloud/secretmanager_v1beta1/google-cloud-secret_manager-v1beta1.gemspec +++ b/shared/output/cloud/secretmanager_v1beta1/google-cloud-secret_manager-v1beta1.gemspec @@ -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 diff --git a/shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec b/shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec index 3a1a2e07b..b9bcc8c54 100644 --- a/shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec +++ b/shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec @@ -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 diff --git a/shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec b/shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec index 5ac7eb31f..1a5e3640d 100644 --- a/shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec +++ b/shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec @@ -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 diff --git a/shared/output/gapic/templates/garbage/google-garbage.gemspec b/shared/output/gapic/templates/garbage/google-garbage.gemspec index a36dda6fc..306f602db 100644 --- a/shared/output/gapic/templates/garbage/google-garbage.gemspec +++ b/shared/output/gapic/templates/garbage/google-garbage.gemspec @@ -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 diff --git a/shared/output/gapic/templates/noservice/google-garbage-noservice.gemspec b/shared/output/gapic/templates/noservice/google-garbage-noservice.gemspec index c51b7188b..cdf2681fb 100644 --- a/shared/output/gapic/templates/noservice/google-garbage-noservice.gemspec +++ b/shared/output/gapic/templates/noservice/google-garbage-noservice.gemspec @@ -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 diff --git a/shared/output/gapic/templates/showcase/google-showcase.gemspec b/shared/output/gapic/templates/showcase/google-showcase.gemspec index 876d253f8..211ecae83 100644 --- a/shared/output/gapic/templates/showcase/google-showcase.gemspec +++ b/shared/output/gapic/templates/showcase/google-showcase.gemspec @@ -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 diff --git a/shared/output/gapic/templates/testing/testing.gemspec b/shared/output/gapic/templates/testing/testing.gemspec index f1d87ecae..feaed9c3c 100644 --- a/shared/output/gapic/templates/testing/testing.gemspec +++ b/shared/output/gapic/templates/testing/testing.gemspec @@ -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