Merge pull request #108 from well-typed/ghc-8.8.1

Ghc 8.8.1

Author: phadej

.travis.yml

@@ -1,10 +1,10 @@
 # This Travis job script has been generated by a script via
 #
-#   haskell-ci 'cabal.project' '--output' '.travis.yml' '--doctest' '--doctest-options=--preserve-it'
+#   haskell-ci 'cabal.project' '--doctest' '--doctest-options=--preserve-it' '--benchmarks-jobs=<8.8'
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.3.20190429
+# version: 0.3.20190815
 #
 language: c
 dist: xenial
@@ -26,6 +26,8 @@ before_cache:
   - rm -rfv $CABALHOME/packages/head.hackage
 matrix:
   include:
+    - compiler: ghc-8.8.1
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
     - compiler: ghc-8.6.5
       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
     - compiler: ghc-8.4.4
@@ -36,13 +38,14 @@ matrix:
       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
 before_install:
   - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
+  - WITHCOMPILER="-w $HC"
   - HCPKG="$HC-pkg"
   - unset CC
   - CABAL=/opt/ghc/bin/cabal
   - CABALHOME=$HOME/.cabal
   - export PATH="$CABALHOME/bin:$PATH"
   - TOP=$(pwd)
-  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
+  - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
   - echo $HCNUMVER
   - CABAL="$CABAL -vnormal+nowrap+markoutput"
   - set -o pipefail
@@ -69,11 +72,13 @@ install:
   - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - TEST=--enable-tests
   - BENCH=--enable-benchmarks
-  - GHCHEAD=${GHCHEAD-false}
+  - if [ $HCNUMVER -ge 80800 ] ; then BENCH=--disable-benchmarks ; fi
+  - HEADHACKAGE=false
   - rm -f $CABALHOME/config
   - |
     echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config
     echo "remote-build-reporting: anonymous"            >> $CABALHOME/config
+    echo "write-ghc-environment-files: always"          >> $CABALHOME/config
     echo "remote-repo-cache: $CABALHOME/packages"       >> $CABALHOME/config
     echo "logs-dir:          $CABALHOME/logs"           >> $CABALHOME/config
     echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config
@@ -89,63 +94,64 @@ install:
   - cat $CABALHOME/config
   - rm -fv cabal.project cabal.project.local cabal.project.freeze
   - travis_retry ${CABAL} v2-update -v
-  - ${CABAL} v2-install -w ${HC} -j2 doctest --constraint='doctest ==0.16.*' | color_cabal_output
+  - ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.*' | color_cabal_output
   # Generate cabal.project
   - rm -rf cabal.project cabal.project.local cabal.project.freeze
   - touch cabal.project
   - |
-    echo 'packages: "sop-core"' >> cabal.project
-    echo 'packages: "generics-sop"' >> cabal.project
+    echo "packages: sop-core" >> cabal.project
+    echo "packages: generics-sop" >> cabal.project
   - |
-    echo "write-ghc-environment-files: always" >> cabal.project
   - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(generics-sop|sop-core)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   - if [ -f "sop-core/configure.ac" ]; then (cd "sop-core" && autoreconf -i); fi
   - if [ -f "generics-sop/configure.ac" ]; then (cd "generics-sop" && autoreconf -i); fi
-  - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
+  - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
   - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
   - rm  cabal.project.freeze
-  - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
-  - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
 script:
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
   # Packaging...
   - ${CABAL} v2-sdist all | color_cabal_output
   # Unpacking...
   - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
   - cd ${DISTDIR} || false
-  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm       '{}' \;
+  - PKGDIR_sop_core="$(find . -maxdepth 1 -type d -regex '.*/sop-core-[0-9.]*')"
+  - PKGDIR_generics_sop="$(find . -maxdepth 1 -type d -regex '.*/generics-sop-[0-9.]*')"
   # Generate cabal.project
   - rm -rf cabal.project cabal.project.local cabal.project.freeze
   - touch cabal.project
   - |
-    echo 'packages: "sop-core-*/*.cabal"' >> cabal.project
-    echo 'packages: "generics-sop-*/*.cabal"' >> cabal.project
+    echo "packages: ${PKGDIR_sop_core}" >> cabal.project
+    echo "packages: ${PKGDIR_generics_sop}" >> cabal.project
   - |
-    echo "write-ghc-environment-files: always" >> cabal.project
   - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(generics-sop|sop-core)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   # Building...
   # this builds all libraries and executables (without tests/benchmarks)
-  - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
   # Building with tests and benchmarks...
   # build & run tests, build benchmarks
-  - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
   # Testing...
-  - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
   # Doctest...
-  - (cd sop-core-* && doctest --preserve-it -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src)
-  - (cd generics-sop-* && doctest --preserve-it -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src)
+  - (cd ${PKGDIR_sop_core} && doctest --preserve-it -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src)
+  - (cd ${PKGDIR_generics_sop} && doctest --preserve-it -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src)
   # cabal check...
-  - (cd sop-core-* && ${CABAL} -vnormal check)
-  - (cd generics-sop-* && ${CABAL} -vnormal check)
+  - (cd ${PKGDIR_sop_core} && ${CABAL} -vnormal check)
+  - (cd ${PKGDIR_generics_sop} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
-  - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
 
-# REGENDATA ["cabal.project","--output",".travis.yml","--doctest","--doctest-options=--preserve-it"]
+# REGENDATA ["cabal.project","--doctest","--doctest-options=--preserve-it","--benchmarks-jobs=<8.8"]
 # EOF

cabal.project

@@ -1 +1 @@
-packages: sop-core/ generics-sop/
+packages: sop-core/ generics-sop/

generics-sop/generics-sop.cabal

@@ -42,7 +42,7 @@ category:            Generics
 build-type:          Simple
 cabal-version:       >=1.10
 extra-source-files:  CHANGELOG.md doctest.sh
-tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5
+tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.1
 
 source-repository head
   type:                git
@@ -67,7 +67,7 @@ library
                        Generics.SOP.Sing
   build-depends:       base                 >= 4.9  && < 5,
                        sop-core             == 0.5.0.*,
-                       template-haskell     >= 2.8  && < 2.15,
+                       template-haskell     >= 2.8  && < 2.16,
                        ghc-prim             >= 0.3  && < 0.6
   hs-source-dirs:      src
   default-language:    Haskell2010
@@ -90,7 +90,10 @@ library
                        KindSignatures
                        DataKinds
                        FunctionalDependencies
-                       AutoDeriveTypeable
+
+  if impl(ghc <8.2)
+    default-extensions: AutoDeriveTypeable
+
   -- if impl(ghc >= 8.6)
   --   default-extensions: NoStarIsType
   other-extensions:    PolyKinds

generics-sop/src/Generics/SOP/Type/Metadata.hs

@@ -33,7 +33,9 @@ module Generics.SOP.Type.Metadata
   , Associativity(..)
   ) where
 
+#if __GLASGOW_HASKELL__ <802
 import Data.Kind (Type)
+#endif
 import Data.Proxy (Proxy (..))
 import GHC.Generics
   ( Associativity(..)

sop-core/sop-core.cabal

@@ -25,7 +25,7 @@ category:            Data
 build-type:          Simple
 cabal-version:       >=1.10
 extra-source-files:  CHANGELOG.md doctest.sh
-tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5
+tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.1
 
 source-repository head
   type:                git
@@ -64,7 +64,10 @@ library
                        KindSignatures
                        DataKinds
                        FunctionalDependencies
-                       AutoDeriveTypeable
+
+  if impl(ghc <8.2)
+    default-extensions: AutoDeriveTypeable
+
   -- if impl(ghc >= 8.6)
   --   default-extensions: NoStarIsType
   other-extensions:    PolyKinds

sop-core/src/Data/SOP/BasicFunctors.hs

@@ -43,7 +43,9 @@ module Data.SOP.BasicFunctors
   , mapKKK
   ) where
 
+#if !MIN_VERSION_base(4,11,0)
 import Data.Semigroup (Semigroup (..))
+#endif
 import Data.Kind (Type)
 import qualified GHC.Generics as GHC
 

sop-core/src/Data/SOP/NP.hs

@@ -91,7 +91,9 @@ import Data.Coerce
 import Data.Kind (Type)
 import Data.Proxy (Proxy(..))
 import Unsafe.Coerce
+#if !MIN_VERSION_base(4,11,0)
 import Data.Semigroup (Semigroup (..))
+#endif
 
 import Control.DeepSeq (NFData(..))