diff options
| author | Tim Smith <tsmith@chef.io> | 2017-01-24 10:17:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 10:17:54 -0800 |
| commit | cc969f8b7a05fed86147765c32766657abd8fce0 (patch) | |
| tree | 481a5a7c51d7379620d5cc40b569c8860088023e | |
| parent | 5804e6dabd1bb7e4aa97f5cc868406e0965efc63 (diff) | |
| parent | 7caddd55aac75c375122ededd0739e12527d2f1f (diff) | |
| download | ohai-cc969f8b7a05fed86147765c32766657abd8fce0.tar.gz | |
Merge pull request #938 from chef/ruby22
Require Ruby 2.2+
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | ohai.gemspec | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 9c113bec..ed14dd13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ before_install: - bundle --version - gem --version rvm: - - 2.1.9 - 2.2.6 - 2.3.3 + - 2.4.0 - ruby-head allow_failures: @@ -17,5 +17,4 @@ group :development do gem "rspec-collection_matchers", "~> 1.0" gem "rspec_junit_formatter" gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping" - gem "activesupport", "< 5.0" if RUBY_VERSION <= "2.2.2" # github_changelog_generator dep end diff --git a/appveyor.yml b/appveyor.yml index 448ec22a..06ceaa7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,6 @@ platform: environment: matrix: - - ruby_version: "21" - ruby_version: "22" - ruby_version: "23" diff --git a/ohai.gemspec b/ohai.gemspec index 233e0fb3..17dedee1 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.email = "adam@chef.io" s.homepage = "https://docs.chef.io/ohai.html" - s.required_ruby_version = ">= 2.1.0" + s.required_ruby_version = ">= 2.2.0" s.add_dependency "systemu", "~> 2.6.4" s.add_dependency "ffi-yajl", "~> 2.2" |