Skip to content

Commit

Permalink
[#148] Support GHC-8.8.1
Browse files Browse the repository at this point in the history
Resolves #148
  • Loading branch information
chshersh committed Nov 30, 2019
1 parent 13f6c31 commit 9391244
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 33 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ matrix:
- ghc: 8.2.2
- ghc: 8.4.4
- ghc: 8.6.5
- ghc: 8.8.1

# stack
- ghc: 8.6.5
- ghc: 8.8.1
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"

install:
Expand Down
9 changes: 5 additions & 4 deletions co-log-benchmark/co-log-benchmark.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: co-log-benchmark
version: 0.0.0
version: 0.0.0.0
synopsis: Benchmarks of the co-log library.
description: Set of benchmarks that can be used to verify
that @co-log@ library does not introduce unnesessarily
Expand All @@ -15,16 +15,17 @@ category: Logging, Benchmarks
build-type: Simple
extra-source-files: CHANGELOG.md
tested-with: GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
GHC == 8.4.4
GHC == 8.6.5
GHC == 8.8.1

source-repository head
type: git
location: https://github.com/kowainik/co-log.git

executable co-log-bench
main-is: Main.hs
build-depends: base >= 4.10 && < 4.13
build-depends: base >= 4.10.1.0 && < 4.14
, bytestring
, co-log
, text
Expand Down
34 changes: 18 additions & 16 deletions co-log-core/co-log-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,18 @@ category: Logging, Contravariant, Comonad
build-type: Simple
stability: stable
extra-doc-files: CHANGELOG.md
, README.md
README.md
tested-with: GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
GHC == 8.4.4
GHC == 8.6.5
GHC == 8.8.1

source-repository head
type: git
location: https://github.com/kowainik/co-log.git

library
hs-source-dirs: src
exposed-modules: Colog.Core
Colog.Core.Action
Colog.Core.Class
Colog.Core.Severity
Colog.Core.IO

build-depends: base >= 4.10 && < 4.13
common common-options
build-depends: base >= 4.10.1.0 && < 4.14

ghc-options: -Wall
-Wincomplete-uni-patterns
Expand All @@ -74,11 +68,19 @@ library
TypeApplications
ViewPatterns

library
import: common-options
hs-source-dirs: src
exposed-modules: Colog.Core
Colog.Core.Action
Colog.Core.Class
Colog.Core.Severity
Colog.Core.IO

test-suite doctest
import: common-options
type: exitcode-stdio-1.0
build-depends: base >= 4.10 && < 4.13
, doctest ^>= 0.16.0
, Glob
default-language: Haskell2010
hs-source-dirs: test
main-is: Doctests.hs
build-depends: doctest ^>= 0.16.0
, Glob ^>= 0.10.0
12 changes: 7 additions & 5 deletions co-log-polysemy/co-log-polysemy.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,18 @@ category: Logging, Contravariant, Comonad, Effects
build-type: Simple
stability: provisional
extra-doc-files: CHANGELOG.md
, README.md
, GHC == 8.4.4
, GHC == 8.6.5
README.md
GHC == 8.2.2
GHC == 8.4.4
GHC == 8.6.5
GHC == 8.8.1

source-repository head
type: git
location: https://github.com/kowainik/co-log.git

common common-options
build-depends: base >= 4.10.0.0 && < 4.13
build-depends: base >= 4.10.1.0 && < 4.14

ghc-options: -Wall
-Wincomplete-uni-patterns
Expand Down Expand Up @@ -82,7 +84,7 @@ library
Colog.Polysemy.Effect

build-depends: co-log-core ^>= 0.2.0.0
, polysemy >= 1.0 && < 1.2
, polysemy ^>= 1.2.0.0

executable play-colog-poly
import: common-options
Expand Down
13 changes: 7 additions & 6 deletions co-log/co-log.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ category: Logging, Contravariant, Comonad
build-type: Simple
stability: provisional
extra-doc-files: CHANGELOG.md
, README.md
README.md
tested-with: GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
GHC == 8.4.4
GHC == 8.6.5
GHC == 8.8.1

source-repository head
type: git
location: https://github.com/kowainik/co-log.git

common common-options
build-depends: base >= 4.10.0.0 && < 4.13
build-depends: base >= 4.10.1.0 && < 4.14

ghc-options: -Wall
-Wincomplete-uni-patterns
Expand Down Expand Up @@ -76,7 +77,7 @@ library
Colog.Pure
Colog.Rotation

build-depends: ansi-terminal ^>= 0.9 || ^>= 0.10
build-depends: ansi-terminal ^>= 0.10
, bytestring ^>= 0.10.8
, co-log-core ^>= 0.2.0.0
, containers >= 0.5.7 && < 0.7
Expand Down Expand Up @@ -122,7 +123,7 @@ test-suite test-co-log
import: common-options
build-depends: co-log
, co-log-core
, hedgehog >= 0.6 && < 1.1
, hedgehog ^>= 1.0
hs-source-dirs: test
main-is: Property.hs
type: exitcode-stdio-1.0
5 changes: 4 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
resolver: nightly-2019-08-20
resolver: nightly-2019-11-29

packages:
- co-log-core
- co-log
- co-log-polysemy
- co-log-benchmark

extra-deps:
- chronos-1.0.9

0 comments on commit 9391244

Please sign in to comment.