From 7065a8cc1b8b01cd32d4b1d5317b323fec5238bd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 7 Mar 2017 14:16:21 +0100
Subject: Bump versions

---
 spec/src/Thermoprint/API.hs         | 8 ++++----
 spec/src/Thermoprint/Identifiers.hs | 8 ++++----
 spec/thermoprint-spec.cabal         | 6 +++---
 spec/thermoprint-spec.nix           | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'spec')

diff --git a/spec/src/Thermoprint/API.hs b/spec/src/Thermoprint/API.hs
index 8e98db8..5b24e54 100644
--- a/spec/src/Thermoprint/API.hs
+++ b/spec/src/Thermoprint/API.hs
@@ -55,11 +55,11 @@ import Test.QuickCheck.Arbitrary (Arbitrary(..), CoArbitrary(..))
 import Test.QuickCheck.Gen (scale, variant, oneof)
 import Test.QuickCheck.Instances
 
-instance (Integral k, Ord k, ToJSON v) => ToJSON (Map k v) where
-  toJSON = toJSON . Map.foldMapWithKey (IntMap.singleton . castId)
+-- instance (Integral k, Ord k, ToJSON v) => ToJSON (Map k v) where
+--   toJSON = toJSON . Map.foldMapWithKey (IntMap.singleton . castId)
 
-instance (Enum k, Ord k, FromJSON v) => FromJSON (Map k v) where
-  parseJSON = fmap (IntMap.foldMapWithKey $ Map.singleton . castId) . parseJSON
+-- instance (Enum k, Ord k, FromJSON v) => FromJSON (Map k v) where
+--   parseJSON = fmap (IntMap.foldMapWithKey $ Map.singleton . castId) . parseJSON
        
 data PrinterStatus = Busy JobId
                    | Available
diff --git a/spec/src/Thermoprint/Identifiers.hs b/spec/src/Thermoprint/Identifiers.hs
index 2a07318..e90602c 100644
--- a/spec/src/Thermoprint/Identifiers.hs
+++ b/spec/src/Thermoprint/Identifiers.hs
@@ -13,16 +13,16 @@ import GHC.Generics (Generic)
 import Control.DeepSeq (NFData)
 
 import Servant.API (ToHttpApiData, FromHttpApiData)
-import Data.Aeson (FromJSON, ToJSON)
+import Data.Aeson (FromJSON, ToJSON, FromJSONKey, ToJSONKey)
 
 newtype PrinterId = PrinterId Integer
-                  deriving (Show, Read, Eq, Ord, Num, Real, Integral, Enum, FromHttpApiData, ToHttpApiData, FromJSON, ToJSON, Typeable, Generic, NFData)
+                  deriving (Show, Read, Eq, Ord, Num, Real, Integral, Enum, FromHttpApiData, ToHttpApiData, FromJSON, ToJSON, ToJSONKey, FromJSONKey, Typeable, Generic, NFData)
 
 newtype JobId = JobId Integer
-              deriving (Show, Read, Eq, Ord, Num, Real, Integral, Enum, FromHttpApiData, ToHttpApiData, FromJSON, ToJSON, Typeable, Generic, NFData)
+              deriving (Show, Read, Eq, Ord, Num, Real, Integral, Enum, FromHttpApiData, ToHttpApiData, FromJSON, ToJSON, ToJSONKey, FromJSONKey, Typeable, Generic, NFData)
 
 newtype DraftId = DraftId Integer
-              deriving (Show, Read, Eq, Ord, Num, Real, Integral, Enum, FromHttpApiData, ToHttpApiData, FromJSON, ToJSON, Typeable, Generic, NFData)
+              deriving (Show, Read, Eq, Ord, Num, Real, Integral, Enum, FromHttpApiData, ToHttpApiData, FromJSON, ToJSON, ToJSONKey, FromJSONKey, Typeable, Generic, NFData)
 
 castId :: (Integral a, Enum b) => a -> b
 castId = toEnum . fromInteger . toInteger
diff --git a/spec/thermoprint-spec.cabal b/spec/thermoprint-spec.cabal
index 138a06e..4bcfe6a 100644
--- a/spec/thermoprint-spec.cabal
+++ b/spec/thermoprint-spec.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                thermoprint-spec
-version:             5.0.1
+version:             6.0.0
 synopsis:            A specification of the API and the payload datatypes and associated utilities
 -- description:         
 homepage:            http://dirty-haskell.org/tags/thermoprint.html
@@ -41,7 +41,7 @@ library
                      , Cabal >=1.22.4 && <2
                      , cabal-test-quickcheck >=0.1.6 && <1
                      , servant >=0.4.4 && <1
-                     , aeson >=0.9.0 && <1
+                     , aeson >=1.0 && <2
                      , base64-bytestring >=1.0.0 && <2
                      , encoding >=0.8 && <1
                      , time >=1.5.0 && <2
@@ -62,4 +62,4 @@ Test-Suite tests
                      , hspec >=2.2.1 && <3
                      , QuickCheck >=2.8.1 && <3
                      , quickcheck-instances >=0.3.11 && <4
-                     , aeson >=0.9.0 && <1
\ No newline at end of file
+                     , aeson >=1.0 && <2
\ No newline at end of file
diff --git a/spec/thermoprint-spec.nix b/spec/thermoprint-spec.nix
index a3093de..d28b405 100644
--- a/spec/thermoprint-spec.nix
+++ b/spec/thermoprint-spec.nix
@@ -4,7 +4,7 @@
 }:
 mkDerivation {
   pname = "thermoprint-spec";
-  version = "5.0.1";
+  version = "6.0.0";
   src = ./.;
   libraryHaskellDepends = [
     aeson base base64-bytestring bytestring Cabal cabal-test-quickcheck
-- 
cgit v1.2.3