Support ghc-8.8.1 (#79)

* Support ghc-8.8.1

* Update test/Test/TypeRep/MapProperty.hs

Co-Authored-By: Dmitrii Kovanikov <kovanikov@gmail.com>

* Remove allow-newer for stack

.travis.yml

@@ -4,7 +4,7 @@ language: haskell
 git:
   depth: 5
 
-cabal: "2.4"
+cabal: "3.0"
 
 cache:
   directories:
@@ -17,15 +17,16 @@ matrix:
   - ghc: 8.2.2
   - ghc: 8.4.4
   - ghc: 8.6.5
+  - ghc: 8.8.1
 
-  - ghc: 8.6.5
+  - ghc: 8.8.1
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
 install:
   - |
     if [ -z "$STACK_YAML" ]; then
-      cabal new-update
-      cabal new-build --enable-tests --enable-benchmarks
+      cabal update
+      cabal build --enable-tests --enable-benchmarks
     else
       curl -sSL https://get.haskellstack.org/ | sh
       stack --version
@@ -35,7 +36,7 @@ install:
 script:
   - |
     if [ -z "$STACK_YAML" ]; then
-      cabal new-test --enable-tests
+      cabal test --enable-tests
     else
       stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror
     fi

stack.yaml

@@ -1,9 +1,5 @@
-resolver: lts-13.26
+resolver: nightly-2019-09-30
 
 extra-deps:
-  - aeson-1.4.4.0
+  - dependent-map-0.2.4.0
   - dependent-sum-0.5
-  - hedgehog-1.0
-  - primitive-0.7.0.0
-  - tasty-hedgehog-1.0.0.1
-  - time-compat-1.9.2.2

test/Test/TypeRep/MapProperty.hs

@@ -83,7 +83,7 @@ test_DeleteInvariant = prop "invariantCheck (delete k b) == True" $ do
 -- it doesn't compare values so it's not true equality. But this should be
 -- enough for tests.
 newtype FpMap f = FpMap (TypeRepMap f)
-  deriving (Show, Semigroup, Monoid)
+  deriving newtype (Show, Semigroup, Monoid)
 
 instance Eq (FpMap f) where
     FpMap (TypeRepMap as1 bs1 _ _) == FpMap (TypeRepMap as2 bs2 _ _) =
@@ -120,7 +120,7 @@ test_MonoidIdentity = prop "x <> mempty == mempty <> x == x" $ do
 ----------------------------------------------------------------------------
 
 data IntProxy (n :: Nat) = IntProxy (Proxy n) Int
-    deriving (Show, Eq)
+    deriving stock (Show, Eq)
 
 genMap :: MonadGen m => m (TypeRepMap IntProxy)
 genMap = fromList <$> Gen.list (Range.linear 0 1000) genTF

typerep-map.cabal

@@ -31,20 +31,24 @@ extra-doc-files:     README.md
 tested-with:         GHC == 8.2.2
                    , GHC == 8.4.4
                    , GHC == 8.6.5
+                   , GHC == 8.8.1
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/typerep-map.git
 
 common common-options
-  build-depends:       base >= 4.10 && < 4.13
+  build-depends:       base >= 4.10 && < 4.14
 
   default-language:    Haskell2010
   default-extensions:  BangPatterns
+                       DerivingStrategies
                        OverloadedStrings
                        RecordWildCards
                        ScopedTypeVariables
                        TypeApplications
+  if impl(ghc >= 8.8.1)
+    ghc-options:       -Wmissing-deriving-strategies
 
 library
   import:              common-options
@@ -82,7 +86,7 @@ test-suite typerep-map-test
                      , Test.TypeRep.VectorOpt
 
   build-tool-depends:  tasty-discover:tasty-discover
-  build-depends:       ghc-typelits-knownnat >= 0.4.2 && < 0.7
+  build-depends:       ghc-typelits-knownnat >= 0.4.2 && < 0.8
                      , hedgehog ^>= 1.0
                      , typerep-map
                      , typerep-extra-impls
@@ -110,7 +114,7 @@ benchmark typerep-map-benchmark
                      , deepseq ^>= 1.4.3.0
                      , dependent-map >= 0.2.4.0 && < 0.5
                      , dependent-sum ^>= 0.5
-                     , ghc-typelits-knownnat >= 0.4.2 && < 0.7
+                     , ghc-typelits-knownnat >= 0.4.2 && < 0.8
                      , typerep-map
                      , typerep-extra-impls