From 00f86d0a5be55df91a32e752fbf10692b7b1bb98 Mon Sep 17 00:00:00 2001
From: Tank Tang <kat@microsoft.com>
Date: Tue, 2 Nov 2021 10:28:23 +0800
Subject: [PATCH] Resolve dependency issue for Nokogiri/Faraday
---
Gemfile | 8 +-------
blob/azure-storage-blob.gemspec | 8 +-------
common/azure-storage-common.gemspec | 11 ++---------
file/azure-storage-file.gemspec | 9 +--------
queue/azure-storage-queue.gemspec | 9 +--------
table/azure-storage-table.gemspec | 8 +-------
6 files changed, 7 insertions(+), 46 deletions(-)
diff --git a/Gemfile b/Gemfile
index 9a52546..12f59ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,13 +27,7 @@ source "https://rubygems.org" do
gem "faraday", "~> 1.0", :require => false
gem "faraday_middleware", "~> 1.0.0.rc1", :require => false
gem "net-http-persistent", "~> 4.0", :require => false
- if RUBY_VERSION < "2.4.0"
- gem "nokogiri", "~> 1.10.4", :require => false
- elsif RUBY_VERSION < "2.5.0"
- gem "nokogiri", "~> 1.11.0.rc2", :require => false
- else
- gem "nokogiri", "~> 1", ">= 1.12.5", :require => false
- end
+ gem "nokogiri", "~> 1", ">= 1.10.8", :require => false
gem "adal", "~> 1.0", :require => false
gem "dotenv", "~> 2.0", :require => false
gem "minitest", "~> 5", :require => false
diff --git a/blob/azure-storage-blob.gemspec b/blob/azure-storage-blob.gemspec
index 04adf40..bc45e52 100644
--- a/blob/azure-storage-blob.gemspec
+++ b/blob/azure-storage-blob.gemspec
@@ -41,13 +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")
- elsif RUBY_VERSION < "2.5.0"
- s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
- else
- s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
- end
+ s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec
index 8f500ce..2a614e5 100644
--- a/common/azure-storage-common.gemspec
+++ b/common/azure-storage-common.gemspec
@@ -42,16 +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", ">= 1.0.0.rc1")
s.add_runtime_dependency("net-http-persistent", '~> 4.0')
- if RUBY_VERSION < "2.4.0"
- s.add_runtime_dependency("nokogiri", "~> 1.10.4")
- elsif RUBY_VERSION < "2.5.0"
- s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
- else
- s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
- end
-
+ s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec
index 0486218..6f5f739 100644
--- a/file/azure-storage-file.gemspec
+++ b/file/azure-storage-file.gemspec
@@ -41,14 +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")
- elsif RUBY_VERSION < "2.5.0"
- s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
- else
- s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
- end
-
+ s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec
index 9382405..1295bd3 100644
--- a/queue/azure-storage-queue.gemspec
+++ b/queue/azure-storage-queue.gemspec
@@ -41,14 +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")
- elsif RUBY_VERSION < "2.5.0"
- s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
- else
- s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
- end
-
+ s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
diff --git a/table/azure-storage-table.gemspec b/table/azure-storage-table.gemspec
index da45369..1c78ea4 100644
--- a/table/azure-storage-table.gemspec
+++ b/table/azure-storage-table.gemspec
@@ -41,13 +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")
- elsif RUBY_VERSION < "2.5.0"
- s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
- else
- s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
- end
+ s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
--
GitLab