Updates for GHC 8.4.x and 8.6.x (#97)

Summary: And bump version to 2.0.1.1

Reviewed By: anubhav94N

Differential Revision: D10011092

fbshipit-source-id: 4d45f79fb4c89112d29d40f0d53a50441a443729

.travis.yml

@@ -40,9 +40,9 @@ matrix:
     - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.4.1"
+    - compiler: "ghc-8.4.3"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.3], sources: [hvr-ghc]}}
 
 before_install:
   - HC=${CC}

Haxl/Core/StateStore.hs

@@ -24,7 +24,9 @@ module Haxl.Core.StateStore
 
 import Data.Map (Map)
 import qualified Data.Map.Strict as Map
+#if __GLASGOW_HASKELL__ < 804
 import Data.Monoid
+#endif
 import Data.Typeable
 import Unsafe.Coerce
 
@@ -48,6 +50,11 @@ class Typeable1 f => StateKey (f :: * -> *) where
 -- | The 'StateStore' maps a 'StateKey' to the 'State' for that type.
 newtype StateStore = StateStore (Map TypeRep StateStoreData)
 
+#if __GLASGOW_HASKELL__ >= 804
+instance Semigroup StateStore where
+  (<>) = mappend
+#endif
+
 instance Monoid StateStore where
   mempty = stateEmpty
   -- Left-biased union

changelog.md

@@ -1,3 +1,8 @@
+# Changes in version 2.0.1.1
+
+  * Support for GHC 8.6.1
+  * Bugfixes
+
 # Changes in version 2.0.1.0
 
   * Exported MemoVar from Haxl.Core.Memo

haxl.cabal

@@ -1,5 +1,5 @@
 name:                haxl
-version:             2.0.1.0
+version:             2.0.1.1
 synopsis:            A Haskell library for efficient, concurrent,
                      and concise data access.
 homepage:            https://github.com/facebook/Haxl
@@ -18,7 +18,7 @@ tested-with:
   GHC==7.10.3,
   GHC==8.0.2,
   GHC==8.2.2,
-  GHC==8.4.1
+  GHC==8.4.3
 
 description:
   Haxl is a library and EDSL for efficient scheduling of concurrent data
@@ -47,7 +47,7 @@ library
     base == 4.*,
     binary >= 0.7 && < 0.10,
     bytestring >= 0.9 && < 0.11,
-    containers == 0.5.*,
+    containers >= 0.5 && < 0.7,
     deepseq,
     exceptions >=0.8 && <0.11,
     filepath >= 1.3 && < 1.5,
@@ -57,7 +57,7 @@ library
     -- text 1.2.1.0 required for instance Binary Text
     text >= 1.2.1.0 && < 1.3,
     time >= 1.4 && < 1.9,
-    stm == 2.4.*,
+    stm >= 2.4 && < 2.6,
     transformers,
     unordered-containers == 0.2.*,
     vector >= 0.10 && <0.13