summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorickLaupa <>2017-08-12 22:23:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-08-12 22:23:00 (GMT)
commitd6276ca07405b7f766d4eabaeca32011dc85f6a3 (patch)
tree23f791dfcd5d20cfaed5376268a55022b1d5c728
parentefdc25cb8b515143eaf9576c002aeef120d153df (diff)
version 0.15.0.2HEAD0.15.0.2master
-rw-r--r--.travis.yml14
-rw-r--r--CHANGELOG.markdown5
-rw-r--r--Database/EventStore/Internal/Control.hs6
-rw-r--r--Database/EventStore/Internal/Operation/ReadEvent/Message.hs2
-rw-r--r--eventstore.cabal14
5 files changed, 27 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index b95be2d..5a487ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,10 @@ matrix:
- env: BUILD=cabal GHCVER=8.0.2 CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
compiler: ": #GHC 8.0.2"
addons: {apt: {packages: [cabal-install-head,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+ - env: BUILD=cabal GHCVER=8.2.1 CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
+ compiler: ": #GHC 8.2.1"
+ addons: {apt: {packages: [cabal-install-head,ghc-8.2.1,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
# Build with the newest GHC and cabal-install. This is an accepted failure,
# see below.
@@ -57,8 +61,8 @@ matrix:
compiler: ": #stack default"
addons: {apt: {packages: [libgmp-dev]}}
- - env: BUILD=stack ARGS="--resolver lts-8"
- compiler: ": #stack 8.0.2"
+ - env: BUILD=stack ARGS="--compiler ghc-8.0.2 --resolver lts-9"
+ compiler: ": #stack 8.0.2 lts-9"
addons: {apt: {packages: [libgmp-dev]}}
# Nightly builds are allowed to fail
@@ -73,8 +77,8 @@ matrix:
# Travis includes an OS X which is incompatible with GHC 7.8.4
- - env: BUILD=stack ARGS="--resolver lts-8"
- compiler: ": #stack 8.0.2 osx"
+ - env: BUILD=stack ARGS="--resolver lts-9 --compiler ghc-8.0.2"
+ compiler: ": #stack 8.0.2 osx lts-9"
os: osx
- env: BUILD=stack ARGS="--resolver nightly"
@@ -173,4 +177,4 @@ script:
esac
set +ex
-# EOF \ No newline at end of file
+# EOF
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 0e832d5..ea4eb3c 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,8 @@
+0.15.0.2
+--------
+* Support GHC 8.2.1.
+* Support Stackage LTS 9.
+
0.15.0.1
--------
* Discard version restriction on `hashable` library.
diff --git a/Database/EventStore/Internal/Control.hs b/Database/EventStore/Internal/Control.hs
index fd0d2e8..d789460 100644
--- a/Database/EventStore/Internal/Control.hs
+++ b/Database/EventStore/Internal/Control.hs
@@ -53,7 +53,11 @@ module Database.EventStore.Internal.Control
--------------------------------------------------------------------------------
import Data.Typeable
+#if __GLASGOW_HASKELL__ != 802
import Data.Typeable.Internal
+#else
+import GHC.Fingerprint
+#endif
--------------------------------------------------------------------------------
import Control.Monad.Reader
@@ -416,4 +420,4 @@ monitorIncrHeartbeatTimeouts :: EventStore ()
monitorIncrHeartbeatTimeouts = do
Env{..} <- getEnv
for_ __monitor $ \Monitoring{..}->
- liftIO $ inc _heartTimeout \ No newline at end of file
+ liftIO $ inc _heartTimeout
diff --git a/Database/EventStore/Internal/Operation/ReadEvent/Message.hs b/Database/EventStore/Internal/Operation/ReadEvent/Message.hs
index 2cb9346..61d25cf 100644
--- a/Database/EventStore/Internal/Operation/ReadEvent/Message.hs
+++ b/Database/EventStore/Internal/Operation/ReadEvent/Message.hs
@@ -4,7 +4,7 @@
#if __GLASGOW_HASKELL__ < 800
{-# OPTIONS_GHC -fcontext-stack=26 #-}
#else
-{-# OPTIONS_GHC -freduction-depth=26 #-}
+{-# OPTIONS_GHC -freduction-depth=0 #-}
#endif
--------------------------------------------------------------------------------
-- |
diff --git a/eventstore.cabal b/eventstore.cabal
index f5b27bf..ce6f8dd 100644
--- a/eventstore.cabal
+++ b/eventstore.cabal
@@ -1,9 +1,9 @@
--- This file has been generated from package.yaml by hpack version 0.17.0.
+-- This file has been generated from package.yaml by hpack version 0.17.1.
--
-- see: https://github.com/sol/hpack
name: eventstore
-version: 0.15.0.1
+version: 0.15.0.2
synopsis: EventStore TCP Client
description: EventStore TCP Client <http://geteventstore.com>
category: Database
@@ -14,7 +14,7 @@ maintainer: yo.eight@gmail.com
copyright: Yorick Laupa
license: BSD3
license-file: LICENSE
-tested-with: GHC >= 7.8.3 && < 8.0.3
+tested-with: GHC >= 7.8.3 && < 8.2.1
build-type: Simple
cabal-version: >= 1.10
@@ -36,12 +36,12 @@ library
default-extensions: NoImplicitPrelude OverloadedStrings LambdaCase RecordWildCards RankNTypes TemplateHaskell QuasiQuotes FlexibleContexts MultiParamTypeClasses TypeFamilies ConstraintKinds
build-depends:
base >=4.7 && <5
- , aeson >=0.8 && <1.2
+ , aeson >=0.8 && <1.3
, mono-traversable ==1.*
, connection ==0.2.*
, dotnet-timespan
, stm
- , time >=1.4 && <1.7
+ , time >=1.4 && <1.9
, uuid ==1.3.*
, lifted-base
, text
@@ -139,12 +139,12 @@ test-suite eventstore-tests
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.7 && <5
- , aeson >=0.8 && <1.2
+ , aeson >=0.8 && <1.3
, mono-traversable ==1.*
, connection ==0.2.*
, dotnet-timespan
, stm
- , time >=1.4 && <1.7
+ , time >=1.4 && <1.9
, uuid ==1.3.*
, lifted-base
, text