diff --git a/.travis.yml b/.travis.yml index c0aaecac..5a253b26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: ruby rvm: - - 1.9.3 - - 2.2.10 - - 2.3.8 - - 2.4.5 - - 2.5.3 - - jruby-9.1.17.0 - - jruby-9.2.5.0 + - 2.4.10 + - 2.5.8 + - 2.6.6 + - 2.7.1 + - jruby-9.2.12.0 + - ruby-head + - jruby-head +matrix: + allow_failures: + - rvm: ruby-head + - rvm: jruby-head diff --git a/Gemfile b/Gemfile index afadc0c4..e9fece90 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,3 @@ source 'https://rubygems.org' gemspec - -gem 'json', '< 2' if RUBY_VERSION.start_with?('1.') -gem 'nokogiri', '< 1.6' if RUBY_VERSION.start_with?('1.8.') -gem 'test-unit', '~> 2.5' if RUBY_VERSION.start_with?('1.8.') diff --git a/rbvmomi.gemspec b/rbvmomi.gemspec index 0f634299..0056cc2b 100644 --- a/rbvmomi.gemspec +++ b/rbvmomi.gemspec @@ -29,5 +29,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency('yard', '~> 0.9.5') spec.add_development_dependency('test-unit', '>= 2.5') - spec.required_ruby_version = '>= 1.8.7' + spec.required_ruby_version = '>= 2.4.1' end diff --git a/test/test_helper.rb b/test/test_helper.rb index 20cf508c..e1f41ec9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,10 +1,8 @@ # Copyright (c) 2011-2017 VMware, Inc. All Rights Reserved. # SPDX-License-Identifier: MIT -unless /^1.8/ =~ RUBY_VERSION - require 'simplecov' - SimpleCov.start { add_filter '/test/' } -end +require 'simplecov' +SimpleCov.start { add_filter '/test/' } require 'rbvmomi' VIM = RbVmomi::VIM diff --git a/test/test_serialization.rb b/test/test_serialization.rb index d3f4b04f..c17ac9cf 100644 --- a/test/test_serialization.rb +++ b/test/test_serialization.rb @@ -240,7 +240,7 @@ def test_keyvalue EOS obj = { 'a' => 'b', :c => 'd' } - check <<-EOS, obj, 'KeyValue', true unless RUBY_VERSION =~ /^1.8/ + check <<-EOS, obj, 'KeyValue', true a b