From 726fb12e0dfa7fdc697fde6385eda92b6f5d35e9 Mon Sep 17 00:00:00 2001 From: jasl Date: Wed, 6 Jan 2021 19:53:48 +0800 Subject: [PATCH] Relax Nokogiri --- Gemfile | 8 ++------ blob/azure-storage-blob.gemspec | 6 +----- common/azure-storage-common.gemspec | 8 ++------ file/azure-storage-file.gemspec | 6 +----- queue/azure-storage-queue.gemspec | 6 +----- table/azure-storage-table.gemspec | 6 +----- 6 files changed, 8 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index 17b234dd..e48bde0e 100644 --- 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 index 24893e19..696da8b7 100644 --- 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 index 2906823f..f8654432 100644 --- 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 index 71a5a317..f5ae6eca 100644 --- 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 index d6d61b0a..d4048224 100644 --- 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 index 21385fcd..c86847d7 100644 --- 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")