[#158] Bump up to GHC-8.6.5 (#159)

* [#158] Bump up to GHC-8.6.5 Resolves #158 * Fix CI * Fix CI for GHC-8.0.2
kowainik · May 9, 2019 · 9f72663 · 9f72663
1 parent af8c5c4
commit 9f72663
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 49 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ language: haskell
 git:
   depth: 5
 
-cabal: "2.0"
+cabal: "2.4"
 
 cache:
   directories:
@@ -19,10 +19,10 @@ matrix:
   - ghc: 8.0.2
   - ghc: 8.2.2
   - ghc: 8.4.4
-  - ghc: 8.6.4
+  - ghc: 8.6.5
 
   # stack
-  - ghc: 8.6.4
+  - ghc: 8.6.5
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
 install:

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Relude
 
 ![Relude: cyclone logo](https://user-images.githubusercontent.com/4276606/44077619-d2abb39a-9fd6-11e8-9d9f-cc57a9d03fa0.png)
-[![Build Status](https://travis-ci.org/kowainik/relude.svg?branch=master)](https://travis-ci.org/kowainik/relude)
-[![Hackage](https://img.shields.io/hackage/v/relude.svg)](https://hackage.haskell.org/package/relude)
+[![Build](https://img.shields.io/travis/kowainik/relude.svg?logo=travis)](http://travis-ci.org/kowainik/relude)
+[![Hackage](https://img.shields.io/hackage/v/relude.svg?logo=haskell)](https://hackage.haskell.org/package/relude)
 [![Stackage LTS](http://stackage.org/package/relude/badge/lts)](http://stackage.org/lts/package/relude)
 [![Stackage Nightly](http://stackage.org/package/relude/badge/nightly)](http://stackage.org/nightly/package/relude)
 [![Hackage-Deps](https://img.shields.io/hackage-deps/v/relude.svg)](http://packdeps.haskellers.com/reverse/relude)

diff --git a/relude.cabal b/relude.cabal
@@ -1,4 +1,4 @@
-cabal-version:       2.0
+cabal-version:       2.4
 name:                relude
 version:             0.5.0
 synopsis:            Custom prelude from Kowainik
@@ -48,7 +48,7 @@ homepage:            https://github.com/kowainik/relude
 bug-reports:         https://github.com/kowainik/relude/issues
 license:             MIT
 license-file:        LICENSE
-author:              Kowainik, Stephen Diehl, Serokell
+author:              Dmitrii Kovanikov, Veronika Romashkina, Stephen Diehl, Serokell
 maintainer:          Kowainik <xrom.xkov@gmail.com>
 copyright:           2016 Stephen Diehl, 2016-2018 Serokell, 2018-2019 Kowainik
 category:            Prelude
@@ -57,7 +57,7 @@ build-type:          Simple
 tested-with:         GHC == 8.0.2
                    , GHC == 8.2.2
                    , GHC == 8.4.4
-                   , GHC == 8.6.4
+                   , GHC == 8.6.5
 extra-doc-files:     CHANGELOG.md
                    , CONTRIBUTING.md
                    , README.md
@@ -66,7 +66,26 @@ source-repository head
   type:     git
   location: git@github.com:kowainik/relude.git
 
+common common-options
+  build-depends:       base >= 4.9 && < 4.13
+
+  ghc-options:         -Wall
+                       -Wcompat
+                       -Widentities
+                       -Wincomplete-uni-patterns
+                       -Wincomplete-record-updates
+                       -fwarn-implicit-prelude
+  if impl(ghc >= 8.2)
+    ghc-options:       -fhide-source-paths
+
+  default-language:    Haskell2010
+  default-extensions:  NoImplicitPrelude
+                       OverloadedStrings
+                       ScopedTypeVariables
+                       TypeApplications
+
 library
+  import:              common-options
   hs-source-dirs:      src
   exposed-modules:
                        Relude
@@ -126,15 +145,8 @@ library
                            Relude.Extra.Validation
                            Relude.Unsafe
 
-  ghc-options:         -Wall
-                       -Wcompat
-                       -Widentities
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -fwarn-implicit-prelude
 
-  build-depends:       base >= 4.9 && < 5
-                     , bytestring ^>= 0.10
+  build-depends:       bytestring ^>= 0.10
                      , containers >= 0.5.7 && < 0.7
                      , deepseq ^>= 1.4
                      , ghc-prim >= 0.4.0.0 && < 0.6
@@ -145,71 +157,48 @@ library
                      , transformers ^>= 0.5
                      , unordered-containers >= 0.2.7 && < 0.3
 
-  default-language:    Haskell2010
-  default-extensions:  NoImplicitPrelude
-                       OverloadedStrings
 
 test-suite relude-test
+  import:              common-options
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
   main-is:             Spec.hs
 
   other-modules:       Test.Relude.Property
 
-  build-depends:       base >= 4.9 && < 5
-                     , relude
+  build-depends:       relude
                      , bytestring
                      , text
                      , hedgehog >= 0.6
                      , tasty
                      , tasty-hedgehog
 
-  ghc-options:         -Wall
-                       -threaded
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -Wcompat
-                       -Widentities
-                       -Wredundant-constraints
-
-  default-language:    Haskell2010
-  default-extensions:  NoImplicitPrelude
-                       TypeApplications
+  ghc-options:         -threaded
 
 test-suite relude-doctest
+  import:              common-options
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
   main-is:             Doctest.hs
 
-  build-depends:       base >= 4.9 && < 5
+  build-depends:       relude
                      , doctest
                      , Glob
                      , QuickCheck
 
   ghc-options:         -threaded
-  default-language:    Haskell2010
 
 benchmark relude-benchmark
+  import:              common-options
   type:                exitcode-stdio-1.0
   hs-source-dirs:      benchmark
   main-is:             Main.hs
 
-  build-depends:       base >= 4.9 && < 5
-                     , relude
+  build-depends:       relude
                      , containers
                      , gauge
                      , unordered-containers
 
-  ghc-options:         -Wall
-                       -threaded
+  ghc-options:         -threaded
                        -rtsopts
-                       -with-rtsopts=-N
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -Wcompat
-                       -Widentities
-                       -Wredundant-constraints
-
-  default-language:    Haskell2010
-  default-extensions:  NoImplicitPrelude
-                       ScopedTypeVariables
+                       -with-rtsopts=-N
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-13.13
+resolver: lts-13.20
 
 extra-deps:
   - tasty-hedgehog-0.2.0.0

diff --git a/test/Doctest.hs b/test/Doctest.hs
@@ -8,6 +8,8 @@ Maintainer: Kowainik <xrom.xkov@gmail.com>
 
 module Main (main) where
 
+import Relude
+
 import System.FilePath.Glob (glob)
 import Test.DocTest (doctest)