Skip to content

Commit

Permalink
Use the latest Chef version for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rjaros87 committed Jun 24, 2016
1 parent 8c970fe commit b3ad4a1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ driver:

provisioner:
name: chef_solo
require_chef_omnibus: 11.14
require_chef_omnibus: latest

platforms:

Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: ruby
sudo: false
rvm:
- 2.0
- 2.1
- 2
before_install:
- gem install bundler
bundler_args: --without integration
cache: bundler
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'

gem 'rake'
gem 'tailor'
gem 'chefspec', '~> 1.3.0'
gem 'chefspec', '~> 4.7'
gem 'foodcritic', '>= 5.0.0'
gem 'chef', '~> 11.14'
gem 'chef', '~> 12.11'
gem 'rubocop'

group :integration do
Expand Down
6 changes: 3 additions & 3 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
maintainer_email '[email protected]'
license 'Apache 2.0'
description 'Installs Google Android SDK'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
issues_url 'https://github.com/gildegoma/chef-android-sdk/issues'
source_url 'https://github.com/gildegoma/chef-android-sdk'
version '0.2.0'

%w(java ark).each do |dep|
depends dep
end
depends 'java'
depends 'ark', '>= 1.1.0'

# TODO: maybe put maven into depends section
recommends 'maven' # Maven 3.1.1+ is required by android-sdk::maven-rescue recipe
Expand Down

0 comments on commit b3ad4a1

Please sign in to comment.