From 4f865297f2e61ace0d837cc5e034937b908dd26e Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sun, 1 Sep 2019 23:30:53 -0600 Subject: [PATCH 1/2] Update Travis configuration to recent MRI versions. --- .travis.yml | 94 +++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0111b0d..f61c409 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,75 +1,47 @@ language: ruby rvm: - - 1.9.3 - - 2.0.0 - - 2.1.0 - - 2.1.1 - - 2.1.2 - - 2.1.3 - - 2.1.4 - - 2.1.5 + - 2.3.8 + - 2.4.7 + - 2.5.6 + - 2.6.4 - jruby - jruby-head jdk: - - openjdk6 - - openjdk7 - - oraclejdk7 - - oraclejdk8 + - openjdk13 + - openjdk14 + - oraclejdk13 + - oraclejdk14 branches: only: - master matrix: exclude: - - rvm: 1.9.3 - jdk: openjdk6 - - rvm: 1.9.3 - jdk: oraclejdk7 - - rvm: 1.9.3 - jdk: oraclejdk8 - - rvm: 2.0.0 - jdk: openjdk6 - - rvm: 2.0.0 - jdk: oraclejdk7 - - rvm: 2.0.0 - jdk: oraclejdk8 - - rvm: 2.1.0 - jdk: openjdk6 - - rvm: 2.1.0 - jdk: oraclejdk7 - - rvm: 2.1.0 - jdk: oraclejdk8 - - rvm: 2.1.1 - jdk: openjdk6 - - rvm: 2.1.1 - jdk: oraclejdk7 - - rvm: 2.1.1 - jdk: oraclejdk8 - - rvm: 2.1.2 - jdk: openjdk6 - - rvm: 2.1.2 - jdk: oraclejdk7 - - rvm: 2.1.2 - jdk: oraclejdk8 - - rvm: 2.1.3 - jdk: openjdk6 - - rvm: 2.1.3 - jdk: oraclejdk7 - - rvm: 2.1.3 - jdk: oraclejdk8 - - rvm: 2.1.4 - jdk: openjdk6 - - rvm: 2.1.4 - jdk: oraclejdk7 - - rvm: 2.1.4 - jdk: oraclejdk8 - - rvm: 2.1.5 - jdk: openjdk6 - - rvm: 2.1.5 - jdk: oraclejdk7 - - rvm: 2.1.5 - jdk: oraclejdk8 + - rvm: 2.3.8 + jdk: openjdk13 + - rvm: 2.3.8 + jdk: oraclejdk13 + - rvm: 2.3.8 + jdk: oraclejdk14 + - rvm: 2.4.7 + jdk: openjdk13 + - rvm: 2.4.7 + jdk: oraclejdk13 + - rvm: 2.4.7 + jdk: oraclejdk14 + - rvm: 2.5.6 + jdk: openjdk13 + - rvm: 2.5.6 + jdk: oraclejdk13 + - rvm: 2.5.6 + jdk: oraclejdk14 + - rvm: 2.6.4 + jdk: openjdk13 + - rvm: 2.6.4 + jdk: oraclejdk13 + - rvm: 2.6.4 + jdk: oraclejdk14 allow_failures: - rvm: jruby-head addons: code_climate: - repo_token: 56e2763b5bfe138f566c5f2bf23c14deee4f8990324436dbde07ee2a34bb87f8 \ No newline at end of file + repo_token: 56e2763b5bfe138f566c5f2bf23c14deee4f8990324436dbde07ee2a34bb87f8 From 13fd3ccc1617b591f1e0bad80760207de5d6dce5 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sun, 1 Sep 2019 23:33:34 -0600 Subject: [PATCH 2/2] Updates Nokogiri version to ~> 1.10. --- odata.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odata.gemspec b/odata.gemspec index 2f40de5..2ba915d 100644 --- a/odata.gemspec +++ b/odata.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'vcr', '~> 2.9.2' spec.add_development_dependency 'timecop', '~> 0.7.1' - spec.add_dependency 'nokogiri', '~> 1.6.2' + spec.add_dependency 'nokogiri', '~> 1.10' spec.add_dependency 'typhoeus', '~> 0.6.8' spec.add_dependency 'andand', '~> 1.3.3' end