Merge pull request #368 from phadej/bounds

Raise bounds

Author: phadej

.travis.yml

@@ -4,7 +4,7 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.3.20190327
+# version: 0.3.20190521
 #
 language: c
 dist: xenial
@@ -29,8 +29,8 @@ before_cache:
   - rm -rfv $CABALHOME/packages/head.hackage
 matrix:
   include:
-    - compiler: ghc-8.6.3
-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.3","cabal-install-2.4"]}}
+    - compiler: ghc-8.6.5
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
     - compiler: ghc-8.4.3
       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.3","cabal-install-2.4"]}}
     - compiler: ghc-8.2.2
@@ -86,6 +86,7 @@ install:
     echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config
     echo "extra-prog-path:   $CABALHOME/bin"            >> $CABALHOME/config
     echo "symlink-bindir:    $CABALHOME/bin"            >> $CABALHOME/config
+    echo "installdir:        $CABALHOME/bin"            >> $CABALHOME/config
     echo "build-summary:     $CABALHOME/logs/build.log" >> $CABALHOME/config
     echo "store-dir:         $CABALHOME/store"          >> $CABALHOME/config
     echo "install-dirs user"                            >> $CABALHOME/config
@@ -102,7 +103,7 @@ install:
     echo 'packages: "."' >> cabal.project
   - |
     echo "write-ghc-environment-files: always" >> cabal.project
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(github)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(github)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
@@ -126,7 +127,7 @@ script:
     echo 'packages: "github-*/*.cabal"' >> cabal.project
   - |
     echo "write-ghc-environment-files: always" >> cabal.project
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(github)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(github)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   # Building...

cabal.project

@@ -4,3 +4,9 @@ packages:
 
 optimization: False
 tests: True
+
+constraints: hashable ^>=1.3
+constraints: semigroups ^>=0.19
+
+allow-newer: aeson-1.4.3.0:hashable
+allow-newer: aeson-1.4.3.0:semigroups

github.cabal

@@ -30,7 +30,7 @@ copyright:
   Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016-2019 Oleg Grenrus
 
 tested-with:
-  GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3 || ==8.6.4
+  GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3 || ==8.6.5
 
 extra-source-files:
   README.md
@@ -155,25 +155,28 @@ library
       aeson                 >=1.4.0.0    && <1.5
     , base-compat           >=0.10.4     && <0.11
     , base16-bytestring     >=0.1.1.6    && <0.2
-    , binary-orphans        >=0.1.8.0    && <0.2
+    , binary-instances      >=1          && <1.1
     , cryptohash-sha1       >=0.11.100.1 && <0.12
     , deepseq-generics      >=0.2.0.0    && <0.3
-    , exceptions            >=0.10.0     && <0.11
-    , hashable              >=1.2.7.0    && <1.3
+    , exceptions            >=0.10.2     && <0.11
+    , hashable              >=1.2.7.0    && <1.4
     , http-client           >=0.5.12     && <0.7
     , http-client-tls       >=0.3.5.3    && <0.4
     , http-link-header      >=1.0.3.1    && <1.1
-    , http-types            >=0.12.1     && <0.13
+    , http-types            >=0.12.3     && <0.13
     , iso8601-time          >=0.1.5      && <0.2
     , network-uri           >=2.6.1.0    && <2.7
-    , semigroups            >=0.18.5     && <0.20
     , tagged
     , tls                   >=1.4.1
-    , transformers-compat   >=0.6        && <0.7
-    , unordered-containers  >=0.2.9.0    && <0.3
+    , transformers-compat   >=0.6.5      && <0.7
+    , unordered-containers  >=0.2.10.0   && <0.3
     , vector                >=0.12.0.1   && <0.13
     , vector-instances      >=3.4        && <3.5
 
+  if !impl(ghc >= 8.0)
+    build-depends:
+      semigroups            >=0.18.5     && <0.20
+
 test-suite github-test
   default-language:   Haskell2010
   type:               exitcode-stdio-1.0

src/GitHub/Internal/Prelude.hs

@@ -42,7 +42,7 @@ import Data.Aeson
        withObject, withText, (.!=), (.:), (.:?), (.=))
 import Data.Aeson.Types         (typeMismatch)
 import Data.Binary              (Binary)
-import Data.Binary.Orphans ()
+import Data.Binary.Instances ()
 import Data.Data                (Data, Typeable)
 import Data.Foldable            (toList)
 import Data.Hashable            (Hashable (..))