From e8fdcc4394927168f7bb6963f76a2deca61ea4b4 Mon Sep 17 00:00:00 2001 From: Tran Ma Date: Wed, 1 Mar 2017 15:53:54 +1100 Subject: [PATCH] Update aeson and zebra --- icicle-compiler/icicle.cabal | 3 +-- icicle-compiler/icicle.lock-7.10.2 | 2 +- icicle-compiler/icicle.lock-8.0.1 | 2 +- icicle-core/icicle-core.lock-7.10.2 | 2 +- icicle-core/icicle-core.lock-8.0.1 | 2 +- icicle-data/icicle-data.lock-7.10.2 | 2 +- icicle-data/icicle-data.lock-8.0.1 | 2 +- icicle-repl/icicle-repl.lock-7.10.2 | 2 +- icicle-repl/icicle-repl.lock-8.0.1 | 2 +- icicle-source/icicle-source.cabal | 2 +- icicle-source/icicle-source.lock-7.10.2 | 1 - icicle-source/icicle-source.lock-8.0.1 | 2 +- lib/zebra | 2 +- 13 files changed, 12 insertions(+), 14 deletions(-) diff --git a/icicle-compiler/icicle.cabal b/icicle-compiler/icicle.cabal index 3d276124..f2fb65c3 100644 --- a/icicle-compiler/icicle.cabal +++ b/icicle-compiler/icicle.cabal @@ -28,7 +28,7 @@ library , icicle-core , icicle-data , icicle-source - , aeson >= 0.8 && < 0.12 + , aeson >= 0.8 && < 1.2 , annotated-wl-pprint == 0.7.* , ansi-terminal == 0.6.* , bifunctors >= 4.2 && < 5.4 @@ -227,7 +227,6 @@ test-suite test , icicle-source , icicle-core , icicle - , ambiata-disorder-aeson , ambiata-disorder-core , ambiata-disorder-corpus , ambiata-disorder-jack diff --git a/icicle-compiler/icicle.lock-7.10.2 b/icicle-compiler/icicle.lock-7.10.2 index bf94327b..9f293cbc 100644 --- a/icicle-compiler/icicle.lock-7.10.2 +++ b/icicle-compiler/icicle.lock-7.10.2 @@ -2,7 +2,7 @@ abstract-deque == 0.3 abstract-par == 0.3.3 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 ansi-wl-pprint == 0.6.7.3 diff --git a/icicle-compiler/icicle.lock-8.0.1 b/icicle-compiler/icicle.lock-8.0.1 index c2cf11e7..3c09a79a 100644 --- a/icicle-compiler/icicle.lock-8.0.1 +++ b/icicle-compiler/icicle.lock-8.0.1 @@ -2,7 +2,7 @@ abstract-deque == 0.3 abstract-par == 0.3.3 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 ansi-wl-pprint == 0.6.7.3 diff --git a/icicle-core/icicle-core.lock-7.10.2 b/icicle-core/icicle-core.lock-7.10.2 index c43e60af..9477f856 100644 --- a/icicle-core/icicle-core.lock-7.10.2 +++ b/icicle-core/icicle-core.lock-7.10.2 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 attoparsec == 0.13.1.0 diff --git a/icicle-core/icicle-core.lock-8.0.1 b/icicle-core/icicle-core.lock-8.0.1 index eaffee34..b86dc8c8 100644 --- a/icicle-core/icicle-core.lock-8.0.1 +++ b/icicle-core/icicle-core.lock-8.0.1 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 attoparsec == 0.13.1.0 diff --git a/icicle-data/icicle-data.lock-7.10.2 b/icicle-data/icicle-data.lock-7.10.2 index c43e60af..9477f856 100644 --- a/icicle-data/icicle-data.lock-7.10.2 +++ b/icicle-data/icicle-data.lock-7.10.2 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 attoparsec == 0.13.1.0 diff --git a/icicle-data/icicle-data.lock-8.0.1 b/icicle-data/icicle-data.lock-8.0.1 index eaffee34..b86dc8c8 100644 --- a/icicle-data/icicle-data.lock-8.0.1 +++ b/icicle-data/icicle-data.lock-8.0.1 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 attoparsec == 0.13.1.0 diff --git a/icicle-repl/icicle-repl.lock-7.10.2 b/icicle-repl/icicle-repl.lock-7.10.2 index 06e62505..d3fe4c45 100644 --- a/icicle-repl/icicle-repl.lock-7.10.2 +++ b/icicle-repl/icicle-repl.lock-7.10.2 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 ansi-wl-pprint == 0.6.7.3 diff --git a/icicle-repl/icicle-repl.lock-8.0.1 b/icicle-repl/icicle-repl.lock-8.0.1 index e253b562..ea9e837c 100644 --- a/icicle-repl/icicle-repl.lock-8.0.1 +++ b/icicle-repl/icicle-repl.lock-8.0.1 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 ansi-wl-pprint == 0.6.7.3 diff --git a/icicle-source/icicle-source.cabal b/icicle-source/icicle-source.cabal index 7a2409eb..ec9188e6 100644 --- a/icicle-source/icicle-source.cabal +++ b/icicle-source/icicle-source.cabal @@ -18,7 +18,7 @@ library , ambiata-p , ambiata-x-eithert , ambiata-x-show - , aeson >= 0.8 && < 0.12 + , aeson >= 0.8 && < 1.2 , ansi-terminal == 0.6.* , bifunctors >= 4.2 && < 5.4 , bytestring == 0.10.* diff --git a/icicle-source/icicle-source.lock-7.10.2 b/icicle-source/icicle-source.lock-7.10.2 index 576a1f1e..faa8440d 100644 --- a/icicle-source/icicle-source.lock-7.10.2 +++ b/icicle-source/icicle-source.lock-7.10.2 @@ -1,6 +1,5 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 attoparsec == 0.13.1.0 diff --git a/icicle-source/icicle-source.lock-8.0.1 b/icicle-source/icicle-source.lock-8.0.1 index 38c1497f..3adb3b48 100644 --- a/icicle-source/icicle-source.lock-8.0.1 +++ b/icicle-source/icicle-source.lock-8.0.1 @@ -1,6 +1,6 @@ # mafia-lock-file-version: 0 adjunctions == 4.3 -aeson == 0.11.2.1 +aeson == 1.1.0.0 annotated-wl-pprint == 0.7.0 ansi-terminal == 0.6.2.3 attoparsec == 0.13.1.0 diff --git a/lib/zebra b/lib/zebra index 4d6d52c8..53ad9e79 160000 --- a/lib/zebra +++ b/lib/zebra @@ -1 +1 @@ -Subproject commit 4d6d52c8207c829647d74481833081c5dfedfc7a +Subproject commit 53ad9e792a091149cf587ef3a56aca6d12a60195