Support 8.6.1 (#108)

* Support 8.6.1

* Fix serialise flag build

* Update Changelog

.travis.yml

@@ -50,14 +50,24 @@ matrix:
         - ghc-8.4.3
         - cabal-install-head
 
+  - ghc: 8.6.1
+    env: GHCVER='8.6.1' CABALVER='head'
+    os: linux
+    addons:
+      apt:
+        sources:
+        - hvr-ghc
+        packages:
+        - ghc-8.6.1
+        - cabal-install-head
+
 install:
   - |
     if [ -z "$STACK_YAML" ]; then
       export PATH="/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH"
       echo $PATH
-      cp cabal.project.local.ubuntu-example cabal.project.local
       cabal new-update
-      cabal new-build --enable-tests --enable-benchmarks --allow-newer -f aeson -f hashable -f serialise -f deepseq
+      cabal new-build --enable-tests --enable-benchmarks -f aeson -f hashable -f serialise -f deepseq
     else
       mkdir -p ~/.local/bin
       export PATH="$HOME/.local/bin:$PATH"
@@ -71,7 +81,7 @@ install:
 script:
   - |
     if [ -z "$STACK_YAML" ]; then
-      cabal new-test --allow-newer
+      cabal new-test
     else
       stack build --test --bench --no-terminal --flag o-clock:aeson --flag o-clock:hashable --flag o-clock:serialise --flag o-clock:deepseq
     fi

CHANGELOG.md

@@ -3,6 +3,11 @@ Change log
 o'clock uses [PVP Versioning][1].
 The change log is available [on GitHub][2].
 
+1.0.0.1
+=======
+
+* Add support for GHC-8.6.1
+
 1.0.0
 =====
 

README.md

@@ -76,6 +76,9 @@ Since this tutorial is literate haskell file, let's first write some pragmas and
 ```haskell
 {-# LANGUAGE CPP              #-}
 {-# LANGUAGE DataKinds        #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType     #-}
+#endif
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies     #-}
 {-# LANGUAGE TypeOperators    #-}

cabal.project

@@ -0,0 +1,5 @@
+packages: .
+tests: True
+benchmarks: True
+
+allow-newer: tiempo:base, tiempo:time, serialise:containers, cborg:containers

o-clock.cabal

@@ -1,5 +1,5 @@
 name:                o-clock
-version:             1.0.0
+version:             1.0.0.1
 synopsis:            Type-safe time library.
 description:         See README.md for details.
 homepage:            https://github.com/serokell/o-clock
@@ -19,6 +19,7 @@ cabal-version:       2.0
 tested-with:         GHC == 8.0.2
                    , GHC == 8.2.2
                    , GHC == 8.4.3
+                   , GHC == 8.6.1
 
 source-repository head
   type:     git
@@ -33,22 +34,22 @@ library
                          Time.Units
   ghc-options:         -Wall
   build-depends:       base         >= 4.9  && < 5
-                     , ghc-prim     >= 0.5
+                     , ghc-prim     ^>= 0.5
   default-language:    Haskell2010
   default-extensions:  OverloadedStrings
                        RecordWildCards
                        ScopedTypeVariables
                        TypeApplications
                        TypeFamilies
   if flag(aeson)
-    build-depends:     aeson    >= 1.2.4
+    build-depends:     aeson    >= 1.2.4 && < 1.5
                      , text
     cpp-options:       -DHAS_aeson
   if flag(hashable)
-    build-depends:     hashable >= 1.2.6
+    build-depends:     hashable >= 1.2.6 && < 1.3
     cpp-options:       -DHAS_hashable
   if flag(deepseq)
-    build-depends:     deepseq  >= 1.4
+    build-depends:     deepseq  ^>= 1.4
     cpp-options:       -DHAS_deepseq
   if flag(serialise)
     build-depends:     serialise >= 0.2
@@ -75,9 +76,9 @@ test-suite o-clock-test
 
   build-depends:       base            >= 4.9  && < 5
                      , o-clock
-                     , hedgehog       ^>= 0.5.1
-                     , tasty          ^>= 0.12
-                     , tasty-hedgehog ^>= 0.1
+                     , hedgehog       ^>= 0.6
+                     , tasty          >= 0.12 && < 1.2
+                     , tasty-hedgehog >= 0.1 && < 0.3
                      , tasty-hspec    ^>= 1.1.3
                      , type-spec      ^>= 0.3.0.1
 
@@ -93,8 +94,8 @@ test-suite o-clock-doctest
 
   build-tool-depends:  doctest:doctest
   build-depends:       base    >= 4.10 && < 5
-                     , doctest >= 0.13
-                     , Glob    >= 0.9
+                     , doctest ^>= 0.16
+                     , Glob    ^>= 0.9
   ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
   default-language:    Haskell2010
 

src/Time/Rational.hs

@@ -4,6 +4,9 @@
 {-# LANGUAGE TypeInType           #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE FlexibleInstances    #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType               #-}
+#endif
 {-# LANGUAGE Rank2Types           #-}
 {-# LANGUAGE TypeOperators        #-}
 {-# LANGUAGE UndecidableInstances #-}

src/Time/Units.hs

@@ -5,8 +5,11 @@
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE ExplicitForAll             #-}
 {-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE InstanceSigs               #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE InstanceSigs               #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType               #-}
+#endif
 {-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE UndecidableInstances       #-}