Skip to content

Commit 00f86d0

Browse files
committed
Resolve dependency issue for Nokogiri/Faraday
1 parent dfcac56 commit 00f86d0

6 files changed

Lines changed: 7 additions & 46 deletions

File tree

Gemfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ source "https://rubygems.org" do
2727
gem "faraday", "~> 1.0", :require => false
2828
gem "faraday_middleware", "~> 1.0.0.rc1", :require => false
2929
gem "net-http-persistent", "~> 4.0", :require => false
30-
if RUBY_VERSION < "2.4.0"
31-
gem "nokogiri", "~> 1.10.4", :require => false
32-
elsif RUBY_VERSION < "2.5.0"
33-
gem "nokogiri", "~> 1.11.0.rc2", :require => false
34-
else
35-
gem "nokogiri", "~> 1", ">= 1.12.5", :require => false
36-
end
30+
gem "nokogiri", "~> 1", ">= 1.10.8", :require => false
3731
gem "adal", "~> 1.0", :require => false
3832
gem "dotenv", "~> 2.0", :require => false
3933
gem "minitest", "~> 5", :require => false

blob/azure-storage-blob.gemspec

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@ Gem::Specification.new do |s|
4141
s.required_ruby_version = ">= 2.3.0"
4242

4343
s.add_runtime_dependency("azure-storage-common", "~> 2.0")
44-
if RUBY_VERSION < "2.4.0"
45-
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
46-
elsif RUBY_VERSION < "2.5.0"
47-
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
48-
else
49-
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
50-
end
44+
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
5145
s.add_development_dependency("dotenv", "~> 2.0")
5246
s.add_development_dependency("minitest", "~> 5")
5347
s.add_development_dependency("minitest-reporters", "~> 1")

common/azure-storage-common.gemspec

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,9 @@ Gem::Specification.new do |s|
4242
s.required_ruby_version = ">= 2.3.0"
4343

4444
s.add_runtime_dependency('faraday', '~> 1.0')
45-
s.add_runtime_dependency('faraday_middleware', '~> 1.0.0.rc1')
45+
s.add_runtime_dependency('faraday_middleware', "~> 1.0", ">= 1.0.0.rc1")
4646
s.add_runtime_dependency("net-http-persistent", '~> 4.0')
47-
if RUBY_VERSION < "2.4.0"
48-
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
49-
elsif RUBY_VERSION < "2.5.0"
50-
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
51-
else
52-
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
53-
end
54-
47+
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
5548
s.add_development_dependency("dotenv", "~> 2.0")
5649
s.add_development_dependency("minitest", "~> 5")
5750
s.add_development_dependency("minitest-reporters", "~> 1")

file/azure-storage-file.gemspec

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@ Gem::Specification.new do |s|
4141
s.required_ruby_version = ">= 2.3.0"
4242

4343
s.add_runtime_dependency("azure-storage-common", "~> 2.0")
44-
if RUBY_VERSION < "2.4.0"
45-
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
46-
elsif RUBY_VERSION < "2.5.0"
47-
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
48-
else
49-
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
50-
end
51-
44+
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
5245
s.add_development_dependency("dotenv", "~> 2.0")
5346
s.add_development_dependency("minitest", "~> 5")
5447
s.add_development_dependency("minitest-reporters", "~> 1")

queue/azure-storage-queue.gemspec

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@ Gem::Specification.new do |s|
4141
s.required_ruby_version = ">= 2.3.0"
4242

4343
s.add_runtime_dependency("azure-storage-common", "~> 2.0")
44-
if RUBY_VERSION < "2.4.0"
45-
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
46-
elsif RUBY_VERSION < "2.5.0"
47-
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
48-
else
49-
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
50-
end
51-
44+
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
5245
s.add_development_dependency("dotenv", "~> 2.0")
5346
s.add_development_dependency("minitest", "~> 5")
5447
s.add_development_dependency("minitest-reporters", "~> 1")

table/azure-storage-table.gemspec

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@ Gem::Specification.new do |s|
4141
s.required_ruby_version = ">= 2.3.0"
4242

4343
s.add_runtime_dependency("azure-storage-common", "~> 2.0")
44-
if RUBY_VERSION < "2.4.0"
45-
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
46-
elsif RUBY_VERSION < "2.5.0"
47-
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
48-
else
49-
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
50-
end
44+
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
5145
s.add_development_dependency("dotenv", "~> 2.0")
5246
s.add_development_dependency("minitest", "~> 5")
5347
s.add_development_dependency("minitest-reporters", "~> 1")

0 commit comments

Comments
 (0)