From 5325acab18ac3a22c3dd4357708bf13f36906471 Mon Sep 17 00:00:00 2001 From: Michael Kelly Date: Thu, 28 Feb 2019 08:48:39 -0500 Subject: [PATCH 1/3] Add dependency support for graphql-ruby 1.9 --- .travis.yml | 1 + Appraisals | 4 +++ Gemfile.lock | 54 ++++++++++++++++++------------------ gemfiles/.bundle/config | 2 ++ gemfiles/graphql_1.9.gemfile | 7 +++++ graphql-cache.gemspec | 4 +-- 6 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 gemfiles/.bundle/config create mode 100644 gemfiles/graphql_1.9.gemfile diff --git a/.travis.yml b/.travis.yml index cfb492c..1459f3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ rvm: - 2.2.10 gemfile: - gemfiles/graphql_1.8.gemfile + - gemfiles/graphql_1.9.gemfile before_script: - gem install bundler - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter diff --git a/Appraisals b/Appraisals index f1b6b76..6aa10aa 100644 --- a/Appraisals +++ b/Appraisals @@ -1,3 +1,7 @@ appraise "graphql-1.8" do gem 'graphql', '~> 1.8' end + +appraise "graphql-1.9" do + gem 'graphql', '~> 1.9' +end diff --git a/Gemfile.lock b/Gemfile.lock index 889c8ea..c073f01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - graphql-cache (0.4.0) - graphql (~> 1.8.0) + graphql-cache (0.6.0) + graphql (~> 1, > 1.8) GEM remote: https://rubygems.org/ @@ -11,47 +11,47 @@ GEM bundler rake thor (>= 0.14.0) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.9) + simplecov (<= 0.13) coderay (1.1.2) diff-lcs (1.3) - docile (1.3.0) - graphql (1.8.6) - json (2.1.0) - method_source (0.9.0) + docile (1.1.5) + graphql (1.9.3) + json (2.2.0) + method_source (0.9.2) mini_cache (1.1.0) - pry (0.11.3) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) rake (10.5.0) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - sequel (5.9.0) - simplecov (0.16.1) - docile (~> 1.1) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + sequel (5.17.0) + simplecov (0.13.0) + docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sqlite3 (1.3.13) - thor (0.20.0) + sqlite3 (1.4.0) + thor (0.20.3) PLATFORMS ruby DEPENDENCIES appraisal - bundler (~> 1.16) + bundler (~> 2.0) codeclimate-test-reporter graphql-cache! mini_cache @@ -63,4 +63,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.16.3 + 2.0.1 diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config new file mode 100644 index 0000000..c127f80 --- /dev/null +++ b/gemfiles/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_RETRY: "1" diff --git a/gemfiles/graphql_1.9.gemfile b/gemfiles/graphql_1.9.gemfile new file mode 100644 index 0000000..fcc8d84 --- /dev/null +++ b/gemfiles/graphql_1.9.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "graphql", "~> 1.9" + +gemspec path: "../" diff --git a/graphql-cache.gemspec b/graphql-cache.gemspec index 3df4cd5..cfa843e 100644 --- a/graphql-cache.gemspec +++ b/graphql-cache.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.2.0' # bc graphql-ruby requires >= 2.2.0 s.add_development_dependency 'appraisal' - s.add_development_dependency 'bundler', '~> 1.16' + s.add_development_dependency 'bundler', '~> 2.0' s.add_development_dependency 'codeclimate-test-reporter' s.add_development_dependency 'mini_cache' s.add_development_dependency 'pry' @@ -32,5 +32,5 @@ Gem::Specification.new do |s| s.add_development_dependency 'simplecov' s.add_development_dependency 'sqlite3' - s.add_dependency 'graphql', '~> 1.8.0' + s.add_dependency 'graphql', '~> 1', '> 1.8' end From 944fed6aac20935440debf81c01af28ecefc1741 Mon Sep 17 00:00:00 2001 From: Michael Kelly Date: Thu, 28 Feb 2019 08:48:59 -0500 Subject: [PATCH 2/3] Bump minor version number for compatibility change From 5503b7dcfceebbaaf39364fcdf5d8c8a5b78e388 Mon Sep 17 00:00:00 2001 From: Michael Kelly Date: Thu, 28 Feb 2019 09:21:26 -0500 Subject: [PATCH 3/3] drop test support for ruby 2.2 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1459f3f..f040659 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ rvm: - 2.5.1 - 2.4.4 - 2.3.7 - - 2.2.10 gemfile: - gemfiles/graphql_1.8.gemfile - gemfiles/graphql_1.9.gemfile