diff options
| author | Tim Smith <tsmith@chef.io> | 2020-04-08 20:15:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 20:15:05 -0700 |
| commit | da232bdf15d718a76818b0c809cc7ec530ea3c48 (patch) | |
| tree | a46a23da77871a085461349dda364c50275df7f5 | |
| parent | 769a76321caff197f28cc487e734c05ad10070fb (diff) | |
| parent | 68446d89772a26310f1beb5be3db38128a179e59 (diff) | |
| download | chef-da232bdf15d718a76818b0c809cc7ec530ea3c48.tar.gz | |
Merge pull request #9633 from chef/lcg/bump-highline
Bump highline to 2.x
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 14de465ba1..e6c410cff5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,7 @@ PATH ffi (~> 1.9, >= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 2) + highline (>= 1.6.9, < 3) iniparse (~> 1.4) license-acceptance (~> 1.0, >= 1.0.5) mixlib-archive (>= 0.4, < 2.0) @@ -75,7 +75,7 @@ PATH ffi (~> 1.9, >= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 2) + highline (>= 1.6.9, < 3) iniparse (~> 1.4) iso8601 (~> 0.12.1) license-acceptance (~> 1.0, >= 1.0.5) @@ -197,7 +197,7 @@ GEM hana (1.3.5) hashdiff (1.0.1) hashie (3.6.0) - highline (1.7.10) + highline (2.0.3) htmlentities (4.3.4) http (2.2.2) addressable (~> 2.3) diff --git a/chef.gemspec b/chef.gemspec index 427a2cfece..0bdd455ab5 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |s| s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2" s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "~> 1.0" # ed25519 ssh key support - s.add_dependency "highline", ">= 1.6.9", "< 2" + s.add_dependency "highline", ">= 1.6.9", "< 3" s.add_dependency "tty-screen", "~> 0.6" # knife list s.add_dependency "pastel" # knife ui.color s.add_dependency "erubis", "~> 2.7" |