merge master

bloodhound.cabal

@@ -44,7 +44,7 @@ library
   build-depends:       base             >= 4.3     && <5,
                        bytestring       >= 0.10.0  && <0.11,
                        containers       >= 0.5.0.0 && <0.6,
-                       aeson            >= 0.11.1  && <1.1,
+                       aeson            >= 0.11.1  && <1.2,
                        http-client      >= 0.4.30  && <0.6,
                        network-uri      >= 2.6     && <2.7,
                        semigroups       >= 0.15    && <0.19,

changelog.md

@@ -1,3 +1,10 @@
+0.12.1.0
+===================
+* @michaelxavier
+  - #162 Allow Aeson 1.1
+* @bermanjosh
+  - #159 Fix bug with tie breaker json instance for MultiMatchQuery
+
 0.12.0.0
 ===================
 This release contains several new APIs, documentation fixes, and some minor type updates, and steps towards ES 2.0 support. Thanks to all of our contributors!

src/Database/V1/Bloodhound/Types.hs

@@ -2012,7 +2012,7 @@ instance BucketAggregation DateRangeResult where
   docCount = dateRangeDocCount
   aggs = dateRangeAggs
 
-instance (FromJSON a, BucketAggregation a) => FromJSON (Bucket a) where
+instance (FromJSON a) => FromJSON (Bucket a) where
   parseJSON (Object v) = Bucket <$>
                          v .: "buckets"
   parseJSON _ = mempty

stack-8.0.yaml

@@ -3,7 +3,7 @@ packages:
 - '.'
 extra-deps:
 - quickcheck-properties-0.1
-
+- aeson-1.1.0.0
 # - http-client-0.5.0
 # - fail-4.9.0.0
 # - http-types-0.9

tests/V1/tests.hs

@@ -586,7 +586,7 @@ instance ApproxEq Vers.Version where
   (=~) = (==)
 instance (ApproxEq a, Show a) => ApproxEq [a] where
   as =~ bs = and (zipWith (=~) as bs)
-instance (ApproxEq l, Show l, ApproxEq r, Show r) => ApproxEq (Either l r) where
+instance (ApproxEq l, ApproxEq r) => ApproxEq (Either l r) where
   Left a =~ Left b = a =~ b
   Right a =~ Right b = a =~ b
   _ =~ _ = False