From e50800856e7ae9ead456f1614c1f4d8b4b13a91c Mon Sep 17 00:00:00 2001 From: Tank Tang <kat@microsoft.com> Date: Sat, 8 Aug 2020 20:12:02 +0800 Subject: [PATCH] Bumped up nokogiri version. --- Gemfile | 6 +++++- blob/azure-storage-blob.gemspec | 6 +++++- common/azure-storage-common.gemspec | 6 +++++- file/azure-storage-file.gemspec | 6 +++++- queue/azure-storage-queue.gemspec | 6 +++++- table/azure-storage-table.gemspec | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 83c6b69..17b234d 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,11 @@ 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 - gem "nokogiri", "~> 1.10.4", :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 "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 0caa842..24893e1 100644 --- a/blob/azure-storage-blob.gemspec +++ b/blob/azure-storage-blob.gemspec @@ -41,7 +41,11 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 2.3.0" s.add_runtime_dependency("azure-storage-common", "~> 2.0") - s.add_runtime_dependency("nokogiri", "~> 1.10.4") + 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_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 53afddb..2906823 100644 --- a/common/azure-storage-common.gemspec +++ b/common/azure-storage-common.gemspec @@ -44,7 +44,11 @@ Gem::Specification.new do |s| s.add_runtime_dependency('faraday', '~> 1.0') s.add_runtime_dependency('faraday_middleware', '~> 1.0.0.rc1') s.add_runtime_dependency("net-http-persistent", '~> 4.0') - s.add_runtime_dependency("nokogiri", "~> 1.10.4") + 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_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 82f4a59..71a5a31 100644 --- a/file/azure-storage-file.gemspec +++ b/file/azure-storage-file.gemspec @@ -41,7 +41,11 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 2.3.0" s.add_runtime_dependency("azure-storage-common", "~> 2.0") - s.add_runtime_dependency("nokogiri", "~> 1.10.4") + 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_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 703eaaf..d6d61b0 100644 --- a/queue/azure-storage-queue.gemspec +++ b/queue/azure-storage-queue.gemspec @@ -41,7 +41,11 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 2.3.0" s.add_runtime_dependency("azure-storage-common", "~> 2.0") - s.add_runtime_dependency("nokogiri", "~> 1.10.4") + 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_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 dcd80c8..21385fc 100644 --- a/table/azure-storage-table.gemspec +++ b/table/azure-storage-table.gemspec @@ -41,7 +41,11 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 2.3.0" s.add_runtime_dependency("azure-storage-common", "~> 2.0") - s.add_runtime_dependency("nokogiri", "~> 1.10.4") + 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_development_dependency("dotenv", "~> 2.0") s.add_development_dependency("minitest", "~> 5") -- GitLab