Relax Nokogiri

Azure · Jan 6, 2021 · 726fb12 · 726fb12
1 parent 05ea58a
commit 726fb12
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,13 +25,9 @@
 #--------------------------------------------------------------------------
 source "https://rubygems.org" do
   gem "faraday",             "~> 1.0", :require => false
-  gem "faraday_middleware",  "~> 1.0.0.rc1", :require => false
+  gem "faraday_middleware",  "~> 1.0", :require => false
   gem "net-http-persistent", "~> 4.0", :require => false
-  if RUBY_VERSION.start_with?("2.3") then
-    gem "nokogiri",            "~> 1.10.4", :require => false
-  else
-    gem "nokogiri",            "~> 1.11.0.rc2", :require => false
-  end
+  gem "nokogiri",            "~> 1.10", :require => false
 
   gem "adal",                "~> 1.0", :require => false
   gem "dotenv",              "~> 2.0", :require => false

diff --git a/blob/azure-storage-blob.gemspec b/blob/azure-storage-blob.gemspec
@@ -41,11 +41,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  if RUBY_VERSION < "2.4.0"
-    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
-  end
+  s.add_runtime_dependency("nokogiri",                "~> 1.10")
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")

diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec
@@ -42,13 +42,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency('faraday',                 '~> 1.0')
-  s.add_runtime_dependency('faraday_middleware',      '~> 1.0.0.rc1')
+  s.add_runtime_dependency('faraday_middleware',      '~> 1.0')
   s.add_runtime_dependency("net-http-persistent",     '~> 4.0')
-  if RUBY_VERSION < "2.4.0"
-    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
-  end
+  s.add_runtime_dependency('nokogiri',                '~> 1.10')
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")

diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec
@@ -41,11 +41,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  if RUBY_VERSION < "2.4.0"
-    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
-  end
+  s.add_runtime_dependency("nokogiri",                "~> 1.10")
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")

diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec
@@ -41,11 +41,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  if RUBY_VERSION < "2.4.0"
-    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
-  end
+  s.add_runtime_dependency("nokogiri",                "~> 1.10")
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")

diff --git a/table/azure-storage-table.gemspec b/table/azure-storage-table.gemspec
@@ -41,11 +41,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  if RUBY_VERSION < "2.4.0"
-    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
-  end
+  s.add_runtime_dependency("nokogiri",                "~> 1.10")
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")