git.iko.soy/typerep-map
on main help sign in
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

commit9e1c7c6f73a873953539f0cc0d81d86f099732f6 authorBrandon Hamilton <brandon.hamilton@gmail.com> dateTue 1 Oct 2019, 13:15 (7 years ago) parent2aff258
4 files changed+17−16
compare with main
unifiedsplit
.travis.yml+6−5 stack.yaml+2−6 test/Test/TypeRep/MapProperty.hs+2−2 typerep-map.cabal+7−3
.travis.yml+6−5
@@ -4,7 +4,7 @@ language: haskell
44git:
55 depth: 5
66
7−cabal: "2.4"
7+cabal: "3.0"
88
99cache:
1010 directories:
@@ -17,15 +17,16 @@ matrix:
1717 - ghc: 8.2.2
1818 - ghc: 8.4.4
1919 - ghc: 8.6.5
20+ - ghc: 8.8.1
2021
21− - ghc: 8.6.5
22+ - ghc: 8.8.1
2223 env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
2324
2425install:
2526 - |
2627 if [ -z "$STACK_YAML" ]; then
27− cabal new-update
28− cabal new-build --enable-tests --enable-benchmarks
28+ cabal update
29+ cabal build --enable-tests --enable-benchmarks
2930 else
3031 curl -sSL https://get.haskellstack.org/ | sh
3132 stack --version
@@ -35,7 +36,7 @@ install:
3536script:
3637 - |
3738 if [ -z "$STACK_YAML" ]; then
38− cabal new-test --enable-tests
39+ cabal test --enable-tests
3940 else
4041 stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror
4142 fi
stack.yaml+2−6
@@ -1,9 +1,5 @@
1−resolver: lts-13.26
1+resolver: nightly-2019-09-30
22
33extra-deps:
4− - aeson-1.4.4.0
4+ - dependent-map-0.2.4.0
55 - dependent-sum-0.5
6− - hedgehog-1.0
7− - primitive-0.7.0.0
8− - tasty-hedgehog-1.0.0.1
9− - time-compat-1.9.2.2
test/Test/TypeRep/MapProperty.hs+2−2
@@ -83,7 +83,7 @@ test_DeleteInvariant = prop "invariantCheck (delete k b) == True" $ do
8383-- it doesn't compare values so it's not true equality. But this should be
8484-- enough for tests.
8585newtype FpMap f = FpMap (TypeRepMap f)
86− deriving (Show, Semigroup, Monoid)
86+ deriving newtype (Show, Semigroup, Monoid)
8787
8888instance Eq (FpMap f) where
8989 FpMap (TypeRepMap as1 bs1 _ _) == FpMap (TypeRepMap as2 bs2 _ _) =
@@ -120,7 +120,7 @@ test_MonoidIdentity = prop "x <> mempty == mempty <> x == x" $ do
120120----------------------------------------------------------------------------
121121
122122data IntProxy (n :: Nat) = IntProxy (Proxy n) Int
123− deriving (Show, Eq)
123+ deriving stock (Show, Eq)
124124
125125genMap :: MonadGen m => m (TypeRepMap IntProxy)
126126genMap = fromList <$> Gen.list (Range.linear 0 1000) genTF
typerep-map.cabal+7−3
@@ -31,20 +31,24 @@ extra-doc-files: README.md
3131tested-with: GHC == 8.2.2
3232 , GHC == 8.4.4
3333 , GHC == 8.6.5
34+ , GHC == 8.8.1
3435
3536source-repository head
3637 type: git
3738 location: https://github.com/kowainik/typerep-map.git
3839
3940common common-options
40− build-depends: base >= 4.10 && < 4.13
41+ build-depends: base >= 4.10 && < 4.14
4142
4243 default-language: Haskell2010
4344 default-extensions: BangPatterns
45+ DerivingStrategies
4446 OverloadedStrings
4547 RecordWildCards
4648 ScopedTypeVariables
4749 TypeApplications
50+ if impl(ghc >= 8.8.1)
51+ ghc-options: -Wmissing-deriving-strategies
4852
4953library
5054 import: common-options
@@ -82,7 +86,7 @@ test-suite typerep-map-test
8286 , Test.TypeRep.VectorOpt
8387
8488 build-tool-depends: tasty-discover:tasty-discover
85− build-depends: ghc-typelits-knownnat >= 0.4.2 && < 0.7
89+ build-depends: ghc-typelits-knownnat >= 0.4.2 && < 0.8
8690 , hedgehog ^>= 1.0
8791 , typerep-map
8892 , typerep-extra-impls
@@ -110,7 +114,7 @@ benchmark typerep-map-benchmark
110114 , deepseq ^>= 1.4.3.0
111115 , dependent-map >= 0.2.4.0 && < 0.5
112116 , dependent-sum ^>= 0.5
113− , ghc-typelits-knownnat >= 0.4.2 && < 0.7
117+ , ghc-typelits-knownnat >= 0.4.2 && < 0.8
114118 , typerep-map
115119 , typerep-extra-impls
116120