Merge pull request #160 from haskell-graphql/156-ghc-8.2

Support GHC 8.2 and 8.0

Author: jml

.circleci/config.yml

@@ -1,27 +1,27 @@
 version: 2
 jobs:
-  build:
+  build-8.0:
     docker:
-      # GHC 8.0.2 is the lowest (and so far, only) supported compiler version.
+      # GHC 8.0.2 is the lowest supported compiler version.
       - image: fpco/stack-build:lts-9.21
     steps:
       - checkout
       - restore_cache:
           keys:
-            - stack-ghc-{{ checksum "stack.yaml" }}
+            - stack-ghc-{{ checksum "stack-8.0.yaml" }}
       - restore_cache:
           keys:
             - stack-deps-{{ checksum "package.yaml" }}
       - run:
           name: Set up Stack
-          command: stack setup --no-terminal --no-reinstall
+          command: STACK_YAML=stack-8.0.yaml stack setup --no-terminal --no-reinstall
       - save_cache:
-          key: stack-ghc-{{ checksum "stack.yaml" }}
+          key: stack-ghc-{{ checksum "stack-8.0.yaml" }}
           paths:
             - /root/.stack
       - run:
           name: Install dependencies
-          command: stack build --skip-ghc-check --no-terminal --test --only-dependencies
+          command: STACK_YAML=stack-8.0.yaml stack build --skip-ghc-check --no-terminal --test --only-dependencies
       - save_cache:
           key: stack-deps-{{ checksum "package.yaml" }}
           paths:
@@ -32,4 +32,44 @@ jobs:
           # *don't* build with -Werror on Hackage as that is strongly
           # discouraged.
           name: Tests
-          command: stack test --skip-ghc-check --no-terminal --pedantic
+          command: STACK_YAML=stack-8.0.yaml stack test --skip-ghc-check --no-terminal --pedantic
+  build-8.2:
+    docker:
+      # Latest stackage LTS for GHC 8.2 at time of writing
+      - image: fpco/stack-build:lts-10.4
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - stack-ghc-{{ checksum "stack-8.2.yaml" }}
+      - restore_cache:
+          keys:
+            - stack-deps-{{ checksum "package.yaml" }}
+      - run:
+          name: Set up Stack
+          command: STACK_YAML=stack-8.2.yaml stack setup --no-terminal --no-reinstall
+      - save_cache:
+          key: stack-ghc-{{ checksum "stack-8.2.yaml" }}
+          paths:
+            - /root/.stack
+      - run:
+          name: Install dependencies
+          command: STACK_YAML=stack-8.2.yaml stack build --skip-ghc-check --no-terminal --test --only-dependencies
+      - save_cache:
+          key: stack-deps-{{ checksum "package.yaml" }}
+          paths:
+            - /root/.stack
+            - .stack-work
+      - run:
+          # Build with --pedantic here to avoid introducing warnings. We
+          # *don't* build with -Werror on Hackage as that is strongly
+          # discouraged.
+          name: Tests
+          command: STACK_YAML=stack-8.2.yaml stack test --skip-ghc-check --no-terminal --pedantic
+
+workflows:
+  version: 2
+  build_all_versions:
+    jobs:
+      - build-8.0
+      - build-8.2

CHANGELOG.rst

@@ -11,6 +11,11 @@ Breaking changes
 * ``Enum`` handlers are now monadic (see `#118`_)
 * restrict usage to Protolude 0.2.1 and later
 
+Improvements
+------------
+
+* Now support GHC 8.2 as well as 8.0.2 and later
+
 .. _`#118`: https://github.com/jml/graphql-api/issues/118
 
 

README.md

@@ -56,7 +56,7 @@ run :: Text -> IO Response
 run = interpretAnonymousQuery @Hello hello
 ```
 
-We require GHC 8.0.2 or later for features like the `@Hello` type application, and for certain bug fixes.
+We require GHC 8.0.2 or later for features like the `@Hello` type application, and for certain bug fixes. We also support GHC 8.2.
 
 With the code above we can now run a query:
 

graphql-api.cabal

@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 39113cf0b3911f4704bf80289a842f6a6cad623940e0146c3af99de590799257
+-- hash: 78a5a4f0c4375f8d03bffd738aeb76a00fdf535cd6bc2e07cdaa13de38b1e614
 
 name:           graphql-api
 version:        0.2.0
@@ -65,9 +65,9 @@ library
 
 test-suite graphql-api-doctests
   type: exitcode-stdio-1.0
-  main-is: Doctests.hs
+  main-is: Main.hs
   hs-source-dirs:
-      tests
+      tests/doctests
   default-extensions: NoImplicitPrelude OverloadedStrings RecordWildCards TypeApplications
   ghc-options: -Wall -fno-warn-redundant-constraints -threaded
   build-depends:
@@ -78,18 +78,6 @@ test-suite graphql-api-doctests
     , protolude >=0.2.1
     , transformers
   other-modules:
-      ASTTests
-      EndToEndTests
-      EnumTests
-      Examples.InputObject
-      Examples.UnionExample
-      ExampleSchema
-      OrderedMapTests
-      ResolverTests
-      SchemaTests
-      Spec
-      ValidationTests
-      ValueTests
       Paths_graphql_api
   default-language: Haskell2010
 
@@ -117,7 +105,6 @@ test-suite graphql-api-tests
     , transformers
   other-modules:
       ASTTests
-      Doctests
       EndToEndTests
       EnumTests
       Examples.InputObject

package.yaml

@@ -51,9 +51,9 @@ tests:
       - directory
 
   graphql-api-doctests:
-    main: Doctests.hs
+    main: Main.hs
     ghc-options: -threaded
-    source-dirs: tests
+    source-dirs: tests/doctests
     dependencies:
       - doctest
 

stack.yaml stack-8.0.yamlstack.yaml renamed to stack-8.0.yaml

@@ -1,4 +1,4 @@
-# GHC 8.0.2 is the lowest (and currently, only) supported compiler version.
+# GHC 8.0.2 is the lowest supported compiler version.
 resolver: lts-9.21
 
 packages:

stack-8.2.yaml

@@ -0,0 +1,7 @@
+# LTS 10.4 is the latest LTS that supports GHC 8.2 at the time of writing.
+resolver: lts-10.4
+
+packages:
+  - "."
+  - "./docs/source/tutorial"
+  - "./graphql-wai"