From 2f4d648700568b39331e9d04a1e702c12f242bca Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Thu, 2 Apr 2020 17:57:07 +0200
Subject: [PATCH] Use GraphQL v15 (#1332)

---
 .travis.yml  | 7 ++++---
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ebc3b4c86b..8b4e6e32088 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,8 @@ node_js:
   - "10"
 
 env:
-  - GRAPHQL_VERSION='0.13'
+  - GRAPHQL_VERSION='legacy'
   - GRAPHQL_VERSION='latest'
-  - GRAPHQL_VERSION='rc'
 
 install:
   - npm config set spin=false
@@ -20,7 +19,9 @@ script:
       npm run format:check;
     fi
   - npm run compile
-  - npm install graphql@$GRAPHQL_VERSION
+  - if [[ $GRAPHQL_VERSION == "legacy" ]]; then
+      npm install graphql@0.13;
+    fi
   - npm run test
 
 # Allow Travis tests to run in containers.
diff --git a/package.json b/package.json
index 431d202da0d..3b1cd9a09ff 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "uuid": "^7.0.2"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "7.1.1",
@@ -79,7 +79,7 @@
     "eslint-watch": "6.0.1",
     "express": "4.17.1",
     "express-graphql": "0.9.0",
-    "graphql": "14.6.0",
+    "graphql": "15.0.0",
     "graphql-subscriptions": "1.1.0",
     "graphql-type-json": "0.3.1",
     "graphql-upload": "10.0.0",