From 9e534f2a37a5cb39d72e8034e1d28aa80d2c63ba Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Fri, 17 May 2019 15:50:48 -0400 Subject: [PATCH] Prep knife-windows v1.0.x Drops requirement on knife-windows, adds requirement on chef >= 15 Requires Ruby 2.5+ Signed-off-by: Bryan McLellan --- .travis.yml | 7 +++---- Gemfile | 4 ++-- VERSION | 2 +- knife-ec2.gemspec | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index abdc510a..5f161f3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,8 @@ dist: xenial matrix: include: - - rvm: 2.3.8 - - rvm: 2.4.5 - - rvm: 2.5.3 - - rvm: 2.6 + - rvm: 2.5.5 + - rvm: 2.6.3 - rvm: ruby-head allow_failures: - rvm: ruby-head @@ -15,6 +13,7 @@ matrix: branches: only: - master + - 0-stable bundler_args: --jobs 7 --without docs debug diff --git a/Gemfile b/Gemfile index 98ecaf95..22a055f9 100644 --- a/Gemfile +++ b/Gemfile @@ -9,8 +9,8 @@ group :debug do end group :test do - gem "chef", ">= 13.0" - gem "chefstyle", "= 0.10.0" + gem "chef", ">= 15.0" + gem "chefstyle" gem "rake" gem "rspec", "~> 3.0" end diff --git a/VERSION b/VERSION index 5d7fc7e4..3eefcb9d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.19.17 \ No newline at end of file +1.0.0 diff --git a/knife-ec2.gemspec b/knife-ec2.gemspec index 56380b75..d0146ede 100644 --- a/knife-ec2.gemspec +++ b/knife-ec2.gemspec @@ -13,10 +13,10 @@ Gem::Specification.new do |s| s.license = "Apache-2.0" s.files = %w{LICENSE} + Dir.glob("lib/**/*") - s.required_ruby_version = ">= 2.3" + s.required_ruby_version = ">= 2.5" + s.add_dependency "chef", ">= 15.0" s.add_dependency "fog-aws", ">= 1", "< 4" - s.add_dependency "knife-windows", "~> 1.0" s.require_paths = ["lib"] end