Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#39] Build with GHC 8.2.2 and GHC 8.6.1 on CI #52

Merged
merged 4 commits into from Oct 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 22 additions & 1 deletion .travis.yml
Expand Up @@ -14,6 +14,17 @@ cache:
matrix:
include:

- ghc: 8.2.2
env: GHCVER='8.2.2' CABALVER='head'
os: linux
addons:
apt:
sources:
- hvr-ghc
packages:
- ghc-8.2.2
- cabal-install-head

- ghc: 8.4.3
env: GHCVER='8.4.3' CABALVER='head'
os: linux
Expand All @@ -25,6 +36,17 @@ 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

- ghc: 8.4.3
env: GHCVER='8.4.3' STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
os: linux
Expand All @@ -33,7 +55,6 @@ matrix:
packages:
- libgmp-dev


install:
- |
if [ -z "$STACK_YAML" ]; then
Expand Down
6 changes: 4 additions & 2 deletions co-log-core/co-log-core.cabal
Expand Up @@ -13,7 +13,9 @@ category: Logging
build-type: Simple
extra-doc-files: CHANGELOG.md
cabal-version: 2.0
tested-with: GHC == 8.4.3
tested-with: GHC == 8.2.2
, GHC == 8.4.3
, GHC == 8.6.1

source-repository head
type: git
Expand All @@ -26,7 +28,7 @@ library
Colog.Core.Class
Colog.Core.Severity

build-depends: base >= 4.11 && < 5
build-depends: base >= 4.10 && < 4.13

ghc-options: -Wall
-Wincomplete-uni-patterns
Expand Down
2 changes: 2 additions & 0 deletions co-log/README.md
Expand Up @@ -31,8 +31,10 @@ import Colog (Message, WithLog, cmap, fmtMessage, logDebug, logInfo, logTextStdo
usingLoggerT)
import Control.Monad.IO.Class (MonadIO, liftIO)

import Data.Semigroup ((<>))
import qualified Data.Text as Text
import qualified Data.Text.IO as TextIO

```

## Simple IO function example
Expand Down
6 changes: 4 additions & 2 deletions co-log/co-log.cabal
Expand Up @@ -13,7 +13,9 @@ copyright: 2018 Kowainik
category: Logging
build-type: Simple
extra-doc-files: CHANGELOG.md
tested-with: GHC == 8.4.3
tested-with: GHC == 8.2.2
, GHC == 8.4.3
, GHC == 8.6.1

source-repository head
type: git
Expand All @@ -31,7 +33,7 @@ library
Colog.Pure
other-modules: Prelude

build-depends: base-noprelude >= 4.11 && < 5
build-depends: base-noprelude >= 4.10 && < 4.13
, ansi-terminal ^>= 0.8
, bytestring ^>= 0.10.8
, co-log-core ^>= 0.1.0
Expand Down
6 changes: 6 additions & 0 deletions co-log/src/Colog/Message.hs
Expand Up @@ -9,6 +9,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE ViewPatterns #-}
{-# LANGUAGE CPP #-}

{- | 'Message' with 'Severity', and logging functions for them.
-}
Expand Down Expand Up @@ -165,7 +166,12 @@ newtype MessageField (m :: Type -> Type) (fieldName :: Symbol) where

instance (KnownSymbol fieldName, a ~ m (FieldType fieldName))
=> IsLabel fieldName (a -> TM.WrapTypeable (MessageField m)) where
#if MIN_VERSION_base_noprelude(4,11,0)
fromLabel field = TM.WrapTypeable $ MessageField @fieldName field
#else
fromLabel field = TM.WrapTypeable $ MessageField @_ @fieldName field
#endif
{-# INLINE fromLabel #-}

extractField
:: Applicative m
Expand Down