diff --git a/.kokoro/bazel-test.sh b/.kokoro/bazel-test.sh index 3599752e8..8fe070b08 100755 --- a/.kokoro/bazel-test.sh +++ b/.kokoro/bazel-test.sh @@ -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 diff --git a/gapic-generator-ads/Gemfile.lock b/gapic-generator-ads/Gemfile.lock index 97345efbd..b38b081ff 100644 --- a/gapic-generator-ads/Gemfile.lock +++ b/gapic-generator-ads/Gemfile.lock @@ -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) @@ -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) diff --git a/gapic-generator-cloud/Gemfile.lock b/gapic-generator-cloud/Gemfile.lock index 73711c627..fe5fa6fb4 100644 --- a/gapic-generator-cloud/Gemfile.lock +++ b/gapic-generator-cloud/Gemfile.lock @@ -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) @@ -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) diff --git a/gapic-generator-cloud/lib/gapic/presenters/cloud_gem_presenter.rb b/gapic-generator-cloud/lib/gapic/presenters/cloud_gem_presenter.rb index b26d73489..ca6ee3de9 100644 --- a/gapic-generator-cloud/lib/gapic/presenters/cloud_gem_presenter.rb +++ b/gapic-generator-cloud/lib/gapic/presenters/cloud_gem_presenter.rb @@ -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 diff --git a/gapic-generator-cloud/lib/gapic/presenters/wrapper_gem_presenter.rb b/gapic-generator-cloud/lib/gapic/presenters/wrapper_gem_presenter.rb index ce9015169..cfe5d5f60 100644 --- a/gapic-generator-cloud/lib/gapic/presenters/wrapper_gem_presenter.rb +++ b/gapic-generator-cloud/lib/gapic/presenters/wrapper_gem_presenter.rb @@ -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 diff --git a/gapic-generator-cloud/templates/cloud/wrapper_gem/gemfile.text.erb b/gapic-generator-cloud/templates/cloud/wrapper_gem/gemfile.text.erb index 535e47cd5..2956174d5 100644 --- a/gapic-generator-cloud/templates/cloud/wrapper_gem/gemfile.text.erb +++ b/gapic-generator-cloud/templates/cloud/wrapper_gem/gemfile.text.erb @@ -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" diff --git a/gapic-generator/Gemfile.lock b/gapic-generator/Gemfile.lock index 59e11dcc0..921de4e12 100644 --- a/gapic-generator/Gemfile.lock +++ b/gapic-generator/Gemfile.lock @@ -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) @@ -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) diff --git a/gapic-generator/lib/gapic/model/mixins.rb b/gapic-generator/lib/gapic/model/mixins.rb index 54661fb94..fbf0d8132 100644 --- a/gapic-generator/lib/gapic/model/mixins.rb +++ b/gapic-generator/lib/gapic/model/mixins.rb @@ -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 diff --git a/gapic-generator/lib/gapic/presenters/sample_presenter.rb b/gapic-generator/lib/gapic/presenters/sample_presenter.rb index 0530b690c..2175cf139 100644 --- a/gapic-generator/lib/gapic/presenters/sample_presenter.rb +++ b/gapic-generator/lib/gapic/presenters/sample_presenter.rb @@ -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 diff --git a/gapic-generator/lib/gapic/presenters/snippet/parameter_presenter.rb b/gapic-generator/lib/gapic/presenters/snippet/parameter_presenter.rb index f955f4ed1..fc16b71b1 100644 --- a/gapic-generator/lib/gapic/presenters/snippet/parameter_presenter.rb +++ b/gapic-generator/lib/gapic/presenters/snippet/parameter_presenter.rb @@ -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 diff --git a/gapic-generator/templates/default/gem/gemfile.text.erb b/gapic-generator/templates/default/gem/gemfile.text.erb index f12719ae7..19fad6c25 100644 --- a/gapic-generator/templates/default/gem/gemfile.text.erb +++ b/gapic-generator/templates/default/gem/gemfile.text.erb @@ -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" diff --git a/gapic-generator/templates/default/snippets/gemfile.text.erb b/gapic-generator/templates/default/snippets/gemfile.text.erb index 9f8d52f3f..fcbfc65fc 100644 --- a/gapic-generator/templates/default/snippets/gemfile.text.erb +++ b/gapic-generator/templates/default/snippets/gemfile.text.erb @@ -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 diff --git a/shared/Gemfile b/shared/Gemfile index 22c8f7b6b..5c6bafb7b 100644 --- a/shared/Gemfile +++ b/shared/Gemfile @@ -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" diff --git a/shared/output/cloud/compute_small/Gemfile b/shared/output/cloud/compute_small/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/compute_small/Gemfile +++ b/shared/output/cloud/compute_small/Gemfile @@ -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" diff --git a/shared/output/cloud/compute_small/google-cloud-compute-v1.gemspec b/shared/output/cloud/compute_small/google-cloud-compute-v1.gemspec index 0474a44e8..c6ed344ec 100644 --- a/shared/output/cloud/compute_small/google-cloud-compute-v1.gemspec +++ b/shared/output/cloud/compute_small/google-cloud-compute-v1.gemspec @@ -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 diff --git a/shared/output/cloud/compute_small/snippets/Gemfile b/shared/output/cloud/compute_small/snippets/Gemfile index c9547b7f8..e8b3abfb7 100644 --- a/shared/output/cloud/compute_small/snippets/Gemfile +++ b/shared/output/cloud/compute_small/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/compute_small_wrapper/Gemfile b/shared/output/cloud/compute_small_wrapper/Gemfile index 23ff6506a..db9bf1e1a 100644 --- a/shared/output/cloud/compute_small_wrapper/Gemfile +++ b/shared/output/cloud/compute_small_wrapper/Gemfile @@ -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" diff --git a/shared/output/cloud/compute_small_wrapper/google-cloud-compute.gemspec b/shared/output/cloud/compute_small_wrapper/google-cloud-compute.gemspec index df6911969..769293da6 100644 --- a/shared/output/cloud/compute_small_wrapper/google-cloud-compute.gemspec +++ b/shared/output/cloud/compute_small_wrapper/google-cloud-compute.gemspec @@ -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 diff --git a/shared/output/cloud/grafeas_v1/Gemfile b/shared/output/cloud/grafeas_v1/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/grafeas_v1/Gemfile +++ b/shared/output/cloud/grafeas_v1/Gemfile @@ -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" diff --git a/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec b/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec index a9c865c8c..c9bed3a86 100644 --- a/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec +++ b/shared/output/cloud/grafeas_v1/grafeas-v1.gemspec @@ -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 diff --git a/shared/output/cloud/grafeas_v1/snippets/Gemfile b/shared/output/cloud/grafeas_v1/snippets/Gemfile index 549551d9d..128bd513d 100644 --- a/shared/output/cloud/grafeas_v1/snippets/Gemfile +++ b/shared/output/cloud/grafeas_v1/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/language_v1/Gemfile b/shared/output/cloud/language_v1/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/language_v1/Gemfile +++ b/shared/output/cloud/language_v1/Gemfile @@ -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" 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 9ec4f0078..948dd5028 100644 --- a/shared/output/cloud/language_v1/google-cloud-language-v1.gemspec +++ b/shared/output/cloud/language_v1/google-cloud-language-v1.gemspec @@ -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 diff --git a/shared/output/cloud/language_v1/snippets/Gemfile b/shared/output/cloud/language_v1/snippets/Gemfile index 9ae0e5281..fa2a4b2e7 100644 --- a/shared/output/cloud/language_v1/snippets/Gemfile +++ b/shared/output/cloud/language_v1/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/language_v1beta1/Gemfile b/shared/output/cloud/language_v1beta1/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/language_v1beta1/Gemfile +++ b/shared/output/cloud/language_v1beta1/Gemfile @@ -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" 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 d63c6f9ad..3f5f4ab8f 100644 --- a/shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec +++ b/shared/output/cloud/language_v1beta1/google-cloud-language-v1beta1.gemspec @@ -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 diff --git a/shared/output/cloud/language_v1beta1/snippets/Gemfile b/shared/output/cloud/language_v1beta1/snippets/Gemfile index 55d5c1d46..a06720921 100644 --- a/shared/output/cloud/language_v1beta1/snippets/Gemfile +++ b/shared/output/cloud/language_v1beta1/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/language_v1beta2/Gemfile b/shared/output/cloud/language_v1beta2/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/language_v1beta2/Gemfile +++ b/shared/output/cloud/language_v1beta2/Gemfile @@ -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" 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 8380a9547..c3054ff12 100644 --- a/shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec +++ b/shared/output/cloud/language_v1beta2/google-cloud-language-v1beta2.gemspec @@ -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 diff --git a/shared/output/cloud/language_v1beta2/snippets/Gemfile b/shared/output/cloud/language_v1beta2/snippets/Gemfile index 9fd5b64b9..89efe6917 100644 --- a/shared/output/cloud/language_v1beta2/snippets/Gemfile +++ b/shared/output/cloud/language_v1beta2/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/language_wrapper/Gemfile b/shared/output/cloud/language_wrapper/Gemfile index 53361de02..8a73355c5 100644 --- a/shared/output/cloud/language_wrapper/Gemfile +++ b/shared/output/cloud/language_wrapper/Gemfile @@ -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" diff --git a/shared/output/cloud/language_wrapper/google-cloud-language.gemspec b/shared/output/cloud/language_wrapper/google-cloud-language.gemspec index c3754f3a6..3e115cf38 100644 --- a/shared/output/cloud/language_wrapper/google-cloud-language.gemspec +++ b/shared/output/cloud/language_wrapper/google-cloud-language.gemspec @@ -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 diff --git a/shared/output/cloud/location/Gemfile b/shared/output/cloud/location/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/location/Gemfile +++ b/shared/output/cloud/location/Gemfile @@ -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" diff --git a/shared/output/cloud/location/google-cloud-location.gemspec b/shared/output/cloud/location/google-cloud-location.gemspec index cd6ac9947..dcb8b41a4 100644 --- a/shared/output/cloud/location/google-cloud-location.gemspec +++ b/shared/output/cloud/location/google-cloud-location.gemspec @@ -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 diff --git a/shared/output/cloud/location/snippets/Gemfile b/shared/output/cloud/location/snippets/Gemfile index 588c49338..850faa6d9 100644 --- a/shared/output/cloud/location/snippets/Gemfile +++ b/shared/output/cloud/location/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/noservice_cloud/Gemfile b/shared/output/cloud/noservice_cloud/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/noservice_cloud/Gemfile +++ b/shared/output/cloud/noservice_cloud/Gemfile @@ -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" diff --git a/shared/output/cloud/noservice_cloud/google-cloud-noservice.gemspec b/shared/output/cloud/noservice_cloud/google-cloud-noservice.gemspec index 54e03065f..b70a8d845 100644 --- a/shared/output/cloud/noservice_cloud/google-cloud-noservice.gemspec +++ b/shared/output/cloud/noservice_cloud/google-cloud-noservice.gemspec @@ -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 diff --git a/shared/output/cloud/noservice_cloud/snippets/Gemfile b/shared/output/cloud/noservice_cloud/snippets/Gemfile index 3d3a35485..6233aa27f 100644 --- a/shared/output/cloud/noservice_cloud/snippets/Gemfile +++ b/shared/output/cloud/noservice_cloud/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/secretmanager_v1beta1/Gemfile b/shared/output/cloud/secretmanager_v1beta1/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/secretmanager_v1beta1/Gemfile +++ b/shared/output/cloud/secretmanager_v1beta1/Gemfile @@ -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" 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 a6037f760..19c541aba 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 @@ -24,6 +24,6 @@ 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" gem.add_dependency "grpc-google-iam-v1", "~> 1.11" end diff --git a/shared/output/cloud/secretmanager_v1beta1/snippets/Gemfile b/shared/output/cloud/secretmanager_v1beta1/snippets/Gemfile index 7d0b3f462..b4656b5d2 100644 --- a/shared/output/cloud/secretmanager_v1beta1/snippets/Gemfile +++ b/shared/output/cloud/secretmanager_v1beta1/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/secretmanager_wrapper/Gemfile b/shared/output/cloud/secretmanager_wrapper/Gemfile index 3728dea6b..3546d2c0f 100644 --- a/shared/output/cloud/secretmanager_wrapper/Gemfile +++ b/shared/output/cloud/secretmanager_wrapper/Gemfile @@ -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" diff --git a/shared/output/cloud/secretmanager_wrapper/google-cloud-secret_manager.gemspec b/shared/output/cloud/secretmanager_wrapper/google-cloud-secret_manager.gemspec index f26a724d8..d14fba40e 100644 --- a/shared/output/cloud/secretmanager_wrapper/google-cloud-secret_manager.gemspec +++ b/shared/output/cloud/secretmanager_wrapper/google-cloud-secret_manager.gemspec @@ -22,7 +22,7 @@ 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-secret_manager-v1", "~> 1.0" gem.add_dependency "google-cloud-secret_manager-v1beta1", ">= 0.2", "< 2.a" end diff --git a/shared/output/cloud/speech_v1/Gemfile b/shared/output/cloud/speech_v1/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/speech_v1/Gemfile +++ b/shared/output/cloud/speech_v1/Gemfile @@ -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" 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 b19239344..1fc325df0 100644 --- a/shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec +++ b/shared/output/cloud/speech_v1/google-cloud-speech-v1.gemspec @@ -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 diff --git a/shared/output/cloud/speech_v1/snippets/Gemfile b/shared/output/cloud/speech_v1/snippets/Gemfile index cbcc9d84c..74bde8030 100644 --- a/shared/output/cloud/speech_v1/snippets/Gemfile +++ b/shared/output/cloud/speech_v1/snippets/Gemfile @@ -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 diff --git a/shared/output/cloud/vision_v1/Gemfile b/shared/output/cloud/vision_v1/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/cloud/vision_v1/Gemfile +++ b/shared/output/cloud/vision_v1/Gemfile @@ -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" 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 10db6394d..74e7ea4f8 100644 --- a/shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec +++ b/shared/output/cloud/vision_v1/google-cloud-vision-v1.gemspec @@ -24,6 +24,6 @@ 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-location", "~> 1.0" + gem.add_dependency "google-cloud-errors", "~> 1.6" + gem.add_dependency "google-cloud-location", "~> 1.5" end diff --git a/shared/output/cloud/vision_v1/snippets/Gemfile b/shared/output/cloud/vision_v1/snippets/Gemfile index f5b6677dd..9e6f42390 100644 --- a/shared/output/cloud/vision_v1/snippets/Gemfile +++ b/shared/output/cloud/vision_v1/snippets/Gemfile @@ -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 diff --git a/shared/output/gapic/templates/garbage/Gemfile b/shared/output/gapic/templates/garbage/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/gapic/templates/garbage/Gemfile +++ b/shared/output/gapic/templates/garbage/Gemfile @@ -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" diff --git a/shared/output/gapic/templates/garbage/snippets/Gemfile b/shared/output/gapic/templates/garbage/snippets/Gemfile index 2aefbd4ce..0ab846182 100644 --- a/shared/output/gapic/templates/garbage/snippets/Gemfile +++ b/shared/output/gapic/templates/garbage/snippets/Gemfile @@ -33,8 +33,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 diff --git a/shared/output/gapic/templates/noservice/Gemfile b/shared/output/gapic/templates/noservice/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/gapic/templates/noservice/Gemfile +++ b/shared/output/gapic/templates/noservice/Gemfile @@ -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" diff --git a/shared/output/gapic/templates/noservice/snippets/Gemfile b/shared/output/gapic/templates/noservice/snippets/Gemfile index 706a8f8a6..9c443eda3 100644 --- a/shared/output/gapic/templates/noservice/snippets/Gemfile +++ b/shared/output/gapic/templates/noservice/snippets/Gemfile @@ -33,8 +33,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 diff --git a/shared/output/gapic/templates/showcase/Gemfile b/shared/output/gapic/templates/showcase/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/gapic/templates/showcase/Gemfile +++ b/shared/output/gapic/templates/showcase/Gemfile @@ -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" diff --git a/shared/output/gapic/templates/showcase/google-showcase.gemspec b/shared/output/gapic/templates/showcase/google-showcase.gemspec index f449cb26a..ff446dc0c 100644 --- a/shared/output/gapic/templates/showcase/google-showcase.gemspec +++ b/shared/output/gapic/templates/showcase/google-showcase.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |gem| gem.required_ruby_version = ">= 3.2" gem.add_dependency "gapic-common", "~> 1.3" - gem.add_dependency "google-cloud-location", "~> 1.0" - gem.add_dependency "google-iam-v1", "~> 1.3" + gem.add_dependency "google-cloud-location", "~> 1.5" + gem.add_dependency "google-iam-v1", "~> 1.7" end diff --git a/shared/output/gapic/templates/showcase/snippets/Gemfile b/shared/output/gapic/templates/showcase/snippets/Gemfile index 64bd21158..b790e4540 100644 --- a/shared/output/gapic/templates/showcase/snippets/Gemfile +++ b/shared/output/gapic/templates/showcase/snippets/Gemfile @@ -33,8 +33,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 diff --git a/shared/output/gapic/templates/testing/Gemfile b/shared/output/gapic/templates/testing/Gemfile index 1d0855890..29b88dd33 100644 --- a/shared/output/gapic/templates/testing/Gemfile +++ b/shared/output/gapic/templates/testing/Gemfile @@ -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" diff --git a/shared/output/gapic/templates/testing/snippets/Gemfile b/shared/output/gapic/templates/testing/snippets/Gemfile index 49649821b..403277967 100644 --- a/shared/output/gapic/templates/testing/snippets/Gemfile +++ b/shared/output/gapic/templates/testing/snippets/Gemfile @@ -33,8 +33,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 diff --git a/shared/output/gapic/templates/testing/testing.gemspec b/shared/output/gapic/templates/testing/testing.gemspec index aa8cfab62..2646c03da 100644 --- a/shared/output/gapic/templates/testing/testing.gemspec +++ b/shared/output/gapic/templates/testing/testing.gemspec @@ -25,5 +25,5 @@ Gem::Specification.new do |gem| gem.add_dependency "gapic-common", "~> 1.3" gem.add_dependency "google-cloud-common", "~> 1.0" - gem.add_dependency "google-cloud-location", "~> 1.0" + gem.add_dependency "google-cloud-location", "~> 1.5" end diff --git a/shared/test/showcase/test_helper.rb b/shared/test/showcase/test_helper.rb index 95ca2b74f..f6ac39f00 100644 --- a/shared/test/showcase/test_helper.rb +++ b/shared/test/showcase/test_helper.rb @@ -16,6 +16,7 @@ require "minitest/autorun" require "minitest/focus" +require "minitest/mock" require "fileutils" require "open3" require "tmpdir"