Skip to content
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

Jump to bottom

Remove json pure #99

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Remove json pure #99

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
5e95ffb
Use TLS when connecting to rubygems.org
aramprice Nov 15, 2024
9fcf258
Replace deprecated `json_pure` with `json`
aramprice Nov 15, 2024
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# subcomponent's license, as noted in the LICENSE file.
#++

source "http://rubygems.org"
source "https://rubygems.org"

# Specify your gem's dependencies in uaa.gemspec
gemspec
5 changes: 1 addition & 4 deletions cf-uaa-lib.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']

# dependencies
s.add_dependency 'multi_json', '>= 1.12.1', '< 1.16'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove multi_json as well? I was looking at the commit history and saw that it was explicitly added again here: dbc4249

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this may be some sort of compatibility thing with json / json_pure though I'm not sure....

per the multi-json readme it looks like in order to use it one should require multi_json and use it via MultiJson...

Doing a search in cf-uaa-lib I don't see any uses of MultiJson:
https://github.com/search?q=repo%3Acloudfoundry%2Fcf-uaa-lib%20MultiJson&type=code

... and the only results for multi_json are in the LICENSE file.

s.add_dependency 'json_pure', '~>2.7'
s.add_dependency 'json', '~>2.7'
s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.2.4'
s.add_dependency 'addressable', '~> 2.8', '>= 2.8.0'

Expand All @@ -42,7 +41,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'simplecov', '~> 0.22.0'
s.add_development_dependency 'simplecov-rcov', '~> 0.3.0'
s.add_development_dependency 'ci_reporter', '>= 1.9.2', '~> 2.0'
s.add_development_dependency 'json_pure', '~>2.7'
s.add_development_dependency 'ci_reporter_rspec', '~> 1.0'

end
4 changes: 2 additions & 2 deletions lib/uaa/util.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# subcomponent's license, as noted in the LICENSE file.
#++

require 'json/pure'
require "base64"
require 'json'
require 'base64'
require 'logger'
require 'uri'

Expand Down