diff --git a/Gemfile b/Gemfile index 9a525463..12f59ee3 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/ChangeLog.md b/blob/ChangeLog.md index c7144d8d..046a3fa3 100644 --- a/blob/ChangeLog.md +++ b/blob/ChangeLog.md @@ -1,3 +1,6 @@ +2021.12 - version 2.0.3 +* Lifted Ruby-version-based restrictions on Nokogiri version. + 2021.10 - version 2.0.2 * Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0. * Added access tier information and creation time of blob in response. diff --git a/blob/azure-storage-blob.gemspec b/blob/azure-storage-blob.gemspec index 04adf40c..bc45e525 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/blob/lib/azure/storage/blob/block.rb b/blob/lib/azure/storage/blob/block.rb index 007dd20d..16f0f915 100644 --- a/blob/lib/azure/storage/blob/block.rb +++ b/blob/lib/azure/storage/blob/block.rb @@ -411,7 +411,7 @@ def create_block_blob_single_put(container, blob, content, options = {}) StorageService.add_metadata_to_headers options[:metadata], headers add_blob_conditional_headers options, headers - headers["x-ms-blob-content-type"] = get_or_apply_content_type(content, options[:content_type]) + StorageService.with_header headers, "x-ms-blob-content-type", get_or_apply_content_type(content, options[:content_type]) # call PutBlob response = call(:put, uri, content, headers, options) diff --git a/blob/lib/azure/storage/blob/version.rb b/blob/lib/azure/storage/blob/version.rb index e0c95a63..5e4e3959 100644 --- a/blob/lib/azure/storage/blob/version.rb +++ b/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 = 2 unless defined? UPDATE + UPDATE = 3 unless defined? UPDATE class << self # @return [String] diff --git a/common/ChangeLog.md b/common/ChangeLog.md index 3222f712..4ae971eb 100644 --- a/common/ChangeLog.md +++ b/common/ChangeLog.md @@ -1,3 +1,6 @@ +2021.12 - version 2.0.4 +* Lifted Ruby-version-based restrictions on Nokogiri version. + 2021.10 - version 2.0.3 * Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0. * Fixed handling of invalid connection strings diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec index 8f500ce6..2a614e58 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/common/lib/azure/storage/common/version.rb b/common/lib/azure/storage/common/version.rb index ed9da12f..133aae0e 100644 --- a/common/lib/azure/storage/common/version.rb +++ b/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 = 3 unless defined? UPDATE + UPDATE = 4 unless defined? UPDATE class << self # @return [String] diff --git a/file/ChangeLog.md b/file/ChangeLog.md index 9d9cffd1..26779e7c 100644 --- a/file/ChangeLog.md +++ b/file/ChangeLog.md @@ -1,3 +1,6 @@ +2021.12 - version 2.0.4 +* Lifted Ruby-version-based restrictions on Nokogiri version. + 2021.10 - version 2.0.3 * Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0. diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec index 04862185..6f5f7393 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/file/lib/azure/storage/file/version.rb b/file/lib/azure/storage/file/version.rb index f2465dd8..dd8abe8f 100644 --- a/file/lib/azure/storage/file/version.rb +++ b/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 = 3 unless defined? UPDATE + UPDATE = 4 unless defined? UPDATE class << self # @return [String] diff --git a/queue/ChangeLog.md b/queue/ChangeLog.md index 0ae0bfe3..07d75e2c 100644 --- a/queue/ChangeLog.md +++ b/queue/ChangeLog.md @@ -1,3 +1,6 @@ +2021.12 - version 2.0.4 +* Lifted Ruby-version-based restrictions on Nokogiri version. + 2021.10 - version 2.0.3 * Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0. diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec index 93824051..1295bd30 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/queue/lib/azure/storage/queue/version.rb b/queue/lib/azure/storage/queue/version.rb index 12fc9def..2baf8419 100644 --- a/queue/lib/azure/storage/queue/version.rb +++ b/queue/lib/azure/storage/queue/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 = 3 unless defined? UPDATE + UPDATE = 4 unless defined? UPDATE class << self # @return [String] diff --git a/table/ChangeLog.md b/table/ChangeLog.md index a9b3aa9d..fcad3f55 100644 --- a/table/ChangeLog.md +++ b/table/ChangeLog.md @@ -1,3 +1,6 @@ +2021.12 - version 2.0.4 +* Lifted Ruby-version-based restrictions on Nokogiri version. + 2021.10 - version 2.0.3 * Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0. diff --git a/table/azure-storage-table.gemspec b/table/azure-storage-table.gemspec index da453696..1c78ea4f 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") diff --git a/table/lib/azure/storage/table/version.rb b/table/lib/azure/storage/table/version.rb index 3e346252..b73f9543 100644 --- a/table/lib/azure/storage/table/version.rb +++ b/table/lib/azure/storage/table/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 = 3 unless defined? UPDATE + UPDATE = 4 unless defined? UPDATE class << self # @return [String]