diff options
| author | Tim Smith <tsmith@chef.io> | 2016-08-23 11:15:08 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2016-08-23 11:15:08 -0700 |
| commit | 89530cdb5d222127ca7338d64c4121bd7b03b791 (patch) | |
| tree | 8dd981ae1906a2bcf9e29dab7e3f59b28f1af0c8 | |
| parent | 50db4d7be53df4bdf9b66da3c95914fc69068ce9 (diff) | |
| download | chef-zero-ruby23.tar.gz | |
Require Ruby 2.2.2 or laterruby23
This removes our pin on Rack < 2
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | chef-zero.gemspec | 4 |
2 files changed, 8 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 716638a..72a9388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,12 @@ script: matrix: include: - - rvm: 2.1.10 + - rvm: 2.2.5 env: PEDANT_KNIFE_TESTS=true PEDANT_ALLOW_RVM=1 - - rvm: 2.1.10 + - rvm: 2.2.5 env: SINGLE_ORG=true - - rvm: 2.1.10 + - rvm: 2.2.5 env: CHEF_FS=true - - rvm: 2.1.10 - env: - - CHEF_FS=true - - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" - rvm: 2.2.5 env: - CHEF_FS=true @@ -36,20 +32,17 @@ matrix: env: - CHEF_FS=true - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" - - rvm: 2.1.10 + - rvm: 2.2.5 env: FILE_STORE=true - - rvm: 2.1.10 + - rvm: 2.2.5 script: bundle exec rake chef_spec env: TEST=chef_spec - - rvm: 2.1.10 - script: bundle exec rake spec - env: TEST=rake_spec - rvm: 2.2.5 script: bundle exec rake spec env: TEST=rake_spec - rvm: 2.3.1 script: bundle exec rake spec env: TEST=rake_spec - - rvm: 2.1.10 + - rvm: 2.3.1 script: bundle exec rake style env: TEST=chefstyle diff --git a/chef-zero.gemspec b/chef-zero.gemspec index fd131a7..3ea5c21 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -12,13 +12,13 @@ Gem::Specification.new do |s| s.homepage = "http://www.chef.io" s.license = "Apache 2.0" - s.required_ruby_version = ">= 2.1.0" + s.required_ruby_version = ">= 2.2.2" s.add_dependency "mixlib-log", "~> 1.3" s.add_dependency "hashie", ">= 2.0", "< 4.0" s.add_dependency "uuidtools", "~> 2.1" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "rack", "< 2" # 2.0 requires Ruby 2.2+ + s.add_dependency "rack", "~> 2.0" s.add_development_dependency "pry" s.add_development_dependency "pry-byebug" |