Skip to content

Commit

Permalink
Merge e0d2591 into 0785285
Browse files Browse the repository at this point in the history
  • Loading branch information
voxik authored Oct 26, 2020
2 parents 0785285 + e0d2591 commit c093f89
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ This release ends support for:

#### Gems

* Explicitly add racc as a runtime dependency. [[#1988](https://github.com/sparklemotion/nokogiri/issues/1988)] (Thanks, [@voxik](https://github.com/voxik)!)
* [MRI] Upgrade mini_portile2 dependency from `~> 2.4.0` to `~> 2.5.0` [[#2005](https://github.com/sparklemotion/nokogiri/issues/2005)] (Thanks, [@alejandroperea](https://github.com/alejandroperea)!)


Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

source "https://rubygems.org/"

gem "racc", "~>1.4"
gem "mini_portile2", "~>2.5.0"

gem "concourse", "~>0.38", :group => [:development, :test]
Expand All @@ -14,7 +15,6 @@ gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
gem "hoe-git", "~>1.6", :group => [:development, :test]
gem "hoe-markdown", "~>1.1", :group => [:development, :test]
gem "minitest", "~>5.8", :group => [:development, :test]
gem "racc", "~>1.5.0", :group => [:development, :test]
gem "rake", "~>13.0", :group => [:development, :test]
gem "rake-compiler", "~>1.1", :group => [:development, :test]
gem "rake-compiler-dock", "~>1.0", :group => [:development, :test]
Expand Down
5 changes: 4 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ HOE = Hoe.spec "nokogiri" do |hoe|
]
hoe.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }

hoe.extra_deps += [
["racc", "~> 1.4"],
]

unless java?
hoe.extra_deps += [
["mini_portile2", "~> 2.5.0"], # keep version in sync with extconf.rb
Expand All @@ -56,7 +60,6 @@ HOE = Hoe.spec "nokogiri" do |hoe|
["hoe-git", "~> 1.6"],
["hoe-markdown", "~> 1.1"],
["minitest", "~> 5.8"],
["racc", "~> 1.5.0"],
["rake", "~> 13.0"],
["rake-compiler", "~> 1.1"],
["rake-compiler-dock", "~> 1.0"],
Expand Down

0 comments on commit c093f89

Please sign in to comment.