Skip to content

Commit

Permalink
Merge pull request #203 from katmsft/prvalidation
Browse files Browse the repository at this point in the history
Update gemspecs to resolve dependency hell for nokogiri.
  • Loading branch information
katmsft authored Oct 28, 2021
2 parents 7296878 + 5c4a584 commit dfcac56
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 5 deletions.
3 changes: 2 additions & 1 deletion blob/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +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.
* 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.

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.
Expand Down
3 changes: 2 additions & 1 deletion common/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +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.
* 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

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.
Expand Down
2 changes: 2 additions & 0 deletions common/azure-storage-common.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ Gem::Specification.new do |s|
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
Expand Down
2 changes: 1 addition & 1 deletion file/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.
* Allowed 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.
Expand Down
2 changes: 2 additions & 0 deletions file/azure-storage-file.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ 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")
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
Expand Down
2 changes: 1 addition & 1 deletion queue/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.
* Allowed 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.
Expand Down
2 changes: 2 additions & 0 deletions queue/azure-storage-queue.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ 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")
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
Expand Down
2 changes: 1 addition & 1 deletion table/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.
* Allowed 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.
Expand Down

0 comments on commit dfcac56

Please sign in to comment.