Skip to content

Commit 7335f6f

Browse files
authored
Merge pull request #99 from bosh-dep-forks/remove-json_pure
Remove json pure
2 parents 4487a57 + 9fcf258 commit 7335f6f

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# subcomponent's license, as noted in the LICENSE file.
1212
#++
1313

14-
source "http://rubygems.org"
14+
source "https://rubygems.org"
1515

1616
# Specify your gem's dependencies in uaa.gemspec
1717
gemspec

cf-uaa-lib.gemspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ Gem::Specification.new do |s|
3131
s.require_paths = ['lib']
3232

3333
# dependencies
34-
s.add_dependency 'multi_json', '>= 1.12.1', '< 1.16'
35-
s.add_dependency 'json_pure', '~>2.7'
34+
s.add_dependency 'json', '~>2.7'
3635
s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.2.4'
3736
s.add_dependency 'addressable', '~> 2.8', '>= 2.8.0'
3837

@@ -42,7 +41,5 @@ Gem::Specification.new do |s|
4241
s.add_development_dependency 'simplecov', '~> 0.22.0'
4342
s.add_development_dependency 'simplecov-rcov', '~> 0.3.0'
4443
s.add_development_dependency 'ci_reporter', '>= 1.9.2', '~> 2.0'
45-
s.add_development_dependency 'json_pure', '~>2.7'
4644
s.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
47-
4845
end

lib/uaa/util.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# subcomponent's license, as noted in the LICENSE file.
1212
#++
1313

14-
require 'json/pure'
15-
require "base64"
14+
require 'json'
15+
require 'base64'
1616
require 'logger'
1717
require 'uri'
1818

0 commit comments

Comments
 (0)