Merge pull request #78 from chef/lcg/travis-matrix-updates

update travis matrix

5 files changed, 27 insertions, 53 deletions

diff --git a/.rspec b/.rspec
index eca491f..69cd6cb 100644
--- a/.rspec
+++ b/.rspec
@@ -1 +1 @@
--cbfp
+-cbfd
diff --git a/.travis.yml b/.travis.yml
index ea59d12..18c29ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,61 +1,34 @@
 sudo: false
 before_install: 
-#  - gem update bundler
+  - gem install bundler
   - bundle --version
-#  - gem update --system
+  - gem update --system
   - gem --version
 bundler_args: --without development_extras --jobs 3 --retry 3
 script:  rake compile; rake spec
 after_success: gem install yajl-ruby; gem install json; gem install psych; FORCE_FFI_YAJL="ext" ffi-yajl-bench
 language: ruby
-rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - 1.9.3
-  - ruby-head
-  - rbx
-  - jruby-19mode
-  - jruby-head
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - openjdk6
 matrix:
-  allow_failures:
+  include:
+    - rvm: 2.3.1
+    - rvm: 2.2.5
     - rvm: ruby-head
+    - rvm: rbx
+    - rvm: jruby
       jdk: oraclejdk7
+    - rvm: jruby
+      jdk: oraclejdk8
+    - rvm: jruby
+      jdk: openjdk7
     - rvm: jruby-head
       jdk: oraclejdk7
     - rvm: jruby-head
+      jdk: oraclejdk8
+    - rvm: jruby-head
       jdk: openjdk7
-  exclude:
-    - rvm: 2.2
-      jdk: openjdk6
-    - rvm: 2.2
-      jdk: openjdk7
-    - rvm: 2.1
-      jdk: openjdk6
-    - rvm: 2.1
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: openjdk6
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 1.9.3
-      jdk: openjdk6
-    - rvm: 1.9.3
-      jdk: openjdk7
-    - rvm: rbx
-      jdk: openjdk6
-    - rvm: rbx
-      jdk: openjdk7
-    - rvm: ruby-head
-      jdk: openjdk6
+  allow_failures:
     - rvm: ruby-head
-      jdk: openjdk7
-    - rvm: jruby-head
-      jdk: openjdk6
+
 branches:
   only:
     - master
diff --git a/Gemfile b/Gemfile
index 330a01b..d16a96f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ end
 
 group :development do
   # for testing loading concurrently with yajl-ruby, not on jruby
-  gem 'yajl-ruby', platforms: [ :ruby, :mswin, :mingw ]
+  # gem 'yajl-ruby', platforms: [ :ruby, :mswin, :mingw ]
   gem 'github_changelog_generator'
 end
 
diff --git a/appveyor.yml b/appveyor.yml
index df5879c..268e8db 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,12 +1,12 @@
 version: "master-{build}"
 
-os: Windows Server 2012
+os: Windows Server 2012 R2
 platform:
   - x64
 
 environment:
   matrix:
-    - ruby_version: "200"
+    - RUBY_VERSION: "23"
 
 clone_folder: c:\projects\ffi-yajl
 clone_depth: 1
@@ -16,11 +16,12 @@ branches:
     - master
 
 install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem
+  - SET PATH=C:\Ruby%RUBY_VERSION%\bin;C:\Ruby23\DevKit\mingw\bin;C:\Ruby23\DevKit\bin;%PATH%
   - echo %PATH%
   - ruby --version
+  - gem update --system || gem update --system || gem update --system
   - gem --version
-  - gem install bundler --quiet --no-ri --no-rdoc
+  - gem install bundler --quiet --no-ri --no-rdoc || gem install bundler --quiet --no-ri --no-rdoc || gem install bundler --quiet --no-ri --no-rdoc
   - bundler --version
 
 build_script:
@@ -28,7 +29,7 @@ build_script:
 
 test_script:
   # compile needs to have the devkit loaded up
-  - C:\Ruby21\DevKit\devkitvars.bat
+  # - C:\Ruby21\DevKit\devkitvars.bat
   - echo %PATH%
   - bundle exec rake compile
   - bundle exec rake spec
diff --git a/ffi-yajl.gemspec.shared b/ffi-yajl.gemspec.shared
index 5cf861f..aff93da 100644
--- a/ffi-yajl.gemspec.shared
+++ b/ffi-yajl.gemspec.shared
@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
   s.email            = "lamont@getchef.com"
   s.homepage         = "http://github.com/chef/ffi-yajl"
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.1"
 
   s.add_development_dependency "rake", "~> 10.1"
   s.add_development_dependency "rspec", "~> 2.99"
   s.add_development_dependency "pry", "~> 0.9"
-  s.add_development_dependency "rake-compiler", "~> 0.8.3"
-  # pin mime-types in order to work on ruby 1.8.7
-  s.add_development_dependency "mime-types", "~> 1.16"
+  s.add_development_dependency "rake-compiler", "~> 1.0"
+  s.add_development_dependency "rack", "~> 1.0"  # pinning for ruby 2.1.x
+  s.add_development_dependency "activesupport", "~> 4.0"  # pinning for ruby 2.1.x
   s.add_dependency "libyajl2", "~> 1.2"
 
   s.bindir       = "bin"