Skip to content

Commit 16afc11

Browse files
authored
fix(google-apis-core): Add missing multi_json runtime dependency for representable (googleapis#26612)
* multi_json was removed from upstream dependencies googleauth (googleapis/google-auth-library-ruby#575) and signet (googleapis/signet#273). * representable documents that if you use representable/json, you must include multi_json in your own dependencies. * Fix CI loading of local changes to google-apis-core. * Run rubocop -a to reformat and sort google-apis-core.gemspec. fixes: googleapis#26611 fixes: googleapis#26613
1 parent a05ee64 commit 16afc11

2 files changed

Lines changed: 28 additions & 20 deletions

File tree

.toys/ci.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ def run
5656
dirs.each { |dir| puts " #{dir}" }
5757
end
5858

59+
if dirs.include? 'google-apis-core'
60+
puts 'Installing local google-apis-core changes...'
61+
Dir.chdir 'google-apis-core' do
62+
exec ['toys', 'install', '--yes']
63+
end
64+
end
65+
5966
dirs.each { |dir| run_in_dir dir }
6067
end
6168

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
require File.expand_path("lib/google/apis/core/version", __dir__)
1+
require File.expand_path('lib/google/apis/core/version', __dir__)
22
gem_version = Google::Apis::Core::VERSION
33

44
Gem::Specification.new do |gem|
5-
gem.name = "google-apis-core"
5+
gem.name = 'google-apis-core'
66
gem.version = gem_version
7-
gem.authors = ["Google LLC"]
8-
gem.email = "googleapis-packages@google.com"
9-
gem.summary = "Common utility and base classes for legacy Google REST clients"
10-
gem.homepage = "https://github.com/google/google-api-ruby-client"
11-
gem.license = "Apache-2.0"
7+
gem.authors = ['Google LLC']
8+
gem.email = 'googleapis-packages@google.com'
9+
gem.summary = 'Common utility and base classes for legacy Google REST clients'
10+
gem.homepage = 'https://github.com/google/google-api-ruby-client'
11+
gem.license = 'Apache-2.0'
1212
gem.metadata = {
13-
"bug_tracker_uri" => "https://github.com/googleapis/google-api-ruby-client/issues",
14-
"changelog_uri" => "https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core/CHANGELOG.md",
15-
"documentation_uri" => "https://googleapis.dev/ruby/google-apis-core/v#{gem_version}",
16-
"source_code_uri" => "https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core"
13+
'bug_tracker_uri' => 'https://github.com/googleapis/google-api-ruby-client/issues',
14+
'changelog_uri' => 'https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core/CHANGELOG.md',
15+
'documentation_uri' => "https://googleapis.dev/ruby/google-apis-core/v#{gem_version}",
16+
'source_code_uri' => 'https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core'
1717
}
1818

19-
gem.files = Dir.glob("lib/**/*.rb") + Dir.glob("*.md") + [".yardopts"]
20-
gem.require_paths = ["lib"]
19+
gem.files = Dir.glob('lib/**/*.rb') + Dir.glob('*.md') + ['.yardopts']
20+
gem.require_paths = ['lib']
2121

2222
gem.required_ruby_version = '>= 3.2'
23-
gem.add_runtime_dependency "representable", "~> 3.0"
24-
gem.add_runtime_dependency "retriable", "~> 3.1"
25-
gem.add_runtime_dependency "addressable", "~> 2.8", ">= 2.8.7"
26-
gem.add_runtime_dependency "mini_mime", "~> 1.1"
27-
gem.add_runtime_dependency "googleauth", "~> 1.14"
28-
gem.add_runtime_dependency "faraday", "~> 2.13"
29-
gem.add_runtime_dependency "faraday-follow_redirects", "~> 0.3"
23+
gem.add_runtime_dependency 'addressable', '~> 2.8', '>= 2.8.7'
24+
gem.add_runtime_dependency 'faraday', '~> 2.13'
25+
gem.add_runtime_dependency 'faraday-follow_redirects', '~> 0.3'
26+
gem.add_runtime_dependency 'googleauth', '~> 1.14'
27+
gem.add_runtime_dependency 'mini_mime', '~> 1.1'
28+
gem.add_runtime_dependency 'multi_json', '~> 1.11'
29+
gem.add_runtime_dependency 'representable', '~> 3.0'
30+
gem.add_runtime_dependency 'retriable', '~> 3.1'
3031
end

0 commit comments

Comments
 (0)