Merge pull request #199 from kakuzei/bumped_up_nokogiri_version

Bumped up nokogiri version.

Author: katmsft

Gemfile

@@ -27,12 +27,13 @@ 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.start_with?("2.3") then
-    gem "nokogiri",            "~> 1.10.4", :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.11.0.rc2", :require => false
+    gem "nokogiri",          "~> 1", ">= 1.12.5", :require => false
   end
-
   gem "adal",                "~> 1.0", :require => false
   gem "dotenv",              "~> 2.0", :require => false
   gem "minitest",            "~> 5", :require => false

blob/ChangeLog.md

@@ -1,3 +1,6 @@
+2021.10 - version 2.0.2
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.1
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 

blob/azure-storage-blob.gemspec

@@ -43,10 +43,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
+  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_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
   s.add_development_dependency("minitest-reporters",  "~> 1")

blob/lib/azure/storage/blob/version.rb

@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 1 unless defined? UPDATE
+        UPDATE = 2 unless defined? UPDATE
 
         class << self
           # @return [String]

common/ChangeLog.md

@@ -1,3 +1,6 @@
+2021.10 - version 2.0.3
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 * Changed to use persistent HTTP client to speed up requests #168.

common/azure-storage-common.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
   else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
 
   s.add_development_dependency("dotenv",              "~> 2.0")

common/lib/azure/storage/common/version.rb

@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 2 unless defined? UPDATE
+        UPDATE = 3 unless defined? UPDATE
 
         class << self
           # @return [String]

file/ChangeLog.md

@@ -1,3 +1,6 @@
+2021.10 - version 2.0.3
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 

file/azure-storage-file.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
   else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
 
   s.add_development_dependency("dotenv",              "~> 2.0")

file/lib/azure/storage/file/version.rb

@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 2 unless defined? UPDATE
+        UPDATE = 3 unless defined? UPDATE
 
         class << self
           # @return [String]