From b41f803e4cce053a954d2b13655cb4041318029e Mon Sep 17 00:00:00 2001 From: Hyunje Jun Date: Tue, 31 Jan 2017 19:13:38 +0900 Subject: [PATCH 1/5] Add @noraesae to CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 43377dd16c..45057f1ad7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -90,6 +90,7 @@ This file lists the contributors to the PureScript compiler project, and the ter - [@seungha-kim](https://github.com/seungha-kim) (Seungha Kim) My existing contributions and all future contributions until further notice are Copyright Seungha Kim, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT). - [@matthewleon](https://github.com/matthewleon) (Matthew Leon) My existing contributions and all future contributions until further notice are Copyright Matthew Leon, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT). - [@alexbiehl](https://github.com/alexbiehl) (Alexander Biehl) My existing contributions and all future contributions until further notice are Copyright Alexander Biehl, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT). +- [@noraesae](https://github.com/noraesae) (Hyunje Jun) My existing contributions and all future contributions until further notice are Copyright Hyunje Jun, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT). ### Companies From e209994262e5cbd121bc28304726b7952568899f Mon Sep 17 00:00:00 2001 From: Hyunje Jun Date: Tue, 31 Jan 2017 19:15:48 +0900 Subject: [PATCH 2/5] Add stack-ghc-8.0.2.yaml It currently uses nightly-2017-01-31. It will be updated to use LTS when a new LTS using GHC 8.0.2 is coming. --- stack-ghc-8.0.2.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 stack-ghc-8.0.2.yaml diff --git a/stack-ghc-8.0.2.yaml b/stack-ghc-8.0.2.yaml new file mode 100644 index 0000000000..3dc2cc64f8 --- /dev/null +++ b/stack-ghc-8.0.2.yaml @@ -0,0 +1,14 @@ +resolver: nightly-2017-01-31 +packages: +- '.' +extra-deps: +- aeson-0.11.3.0 +- bower-json-1.0.0.1 +- http-client-0.4.31.2 +- http-client-tls-0.2.4.1 +- optparse-applicative-0.13.0.0 +- pipes-4.1.9 +- pipes-http-1.0.2 +- turtle-1.3.1 +- wai-websockets-3.0.0.9 +- websockets-0.9.6.2 From b1e8ffbdb8f9018f8bcef3ebf83e78fffcaea6e7 Mon Sep 17 00:00:00 2001 From: Hyunje Jun Date: Tue, 31 Jan 2017 19:18:12 +0900 Subject: [PATCH 3/5] Build fix for nightly-2017-01-31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'Ambiguous occurrence ‘<|>’' occurs because the new version of aeson-better-errors exports ‘<|>’ too. Also modified other stack.yaml's to use the new aeson-better-errors. --- src/Language/PureScript/Docs/Types.hs | 2 +- stack-ghc-8.0.yaml | 7 ++++--- stack.yaml | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Language/PureScript/Docs/Types.hs b/src/Language/PureScript/Docs/Types.hs index 7593dd2ca4..6697085d0c 100644 --- a/src/Language/PureScript/Docs/Types.hs +++ b/src/Language/PureScript/Docs/Types.hs @@ -10,7 +10,7 @@ import Prelude (String, unlines, lookup) import Control.Arrow ((***)) import Data.Aeson ((.=)) -import Data.Aeson.BetterErrors +import Data.Aeson.BetterErrors hiding ((<|>)) import qualified Data.Map as Map import Data.Time.Clock (UTCTime) import qualified Data.Time.Format as TimeFormat diff --git a/stack-ghc-8.0.yaml b/stack-ghc-8.0.yaml index 5ebb5a40ca..532fcb926d 100644 --- a/stack-ghc-8.0.yaml +++ b/stack-ghc-8.0.yaml @@ -2,9 +2,10 @@ resolver: lts-7.9 packages: - '.' extra-deps: +- aeson-better-errors-0.9.1.0 +- bower-json-1.0.0.1 +- optparse-applicative-0.13.0.0 - pipes-http-1.0.2 +- turtle-1.3.1 - wai-websockets-3.0.0.9 - websockets-0.9.6.2 -- bower-json-1.0.0.1 -- turtle-1.3.1 -- optparse-applicative-0.13.0.0 \ No newline at end of file diff --git a/stack.yaml b/stack.yaml index b5edd07db6..44b96703a5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,6 +2,7 @@ resolver: lts-6.25 packages: - '.' extra-deps: +- aeson-better-errors-0.9.1.0 - bower-json-1.0.0.1 +- optparse-applicative-0.13.0.0 - turtle-1.3.1 -- optparse-applicative-0.13.0.0 \ No newline at end of file From 63c8ba7cc8ebc951281b23b3eb3e814e6d56000e Mon Sep 17 00:00:00 2001 From: Hyunje Jun Date: Tue, 31 Jan 2017 21:10:44 +0900 Subject: [PATCH 4/5] Replace stack-ghc-8.0.yaml with one of 8.0.2 --- stack-ghc-8.0.2.yaml | 14 -------------- stack-ghc-8.0.yaml | 7 +++++-- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 stack-ghc-8.0.2.yaml diff --git a/stack-ghc-8.0.2.yaml b/stack-ghc-8.0.2.yaml deleted file mode 100644 index 3dc2cc64f8..0000000000 --- a/stack-ghc-8.0.2.yaml +++ /dev/null @@ -1,14 +0,0 @@ -resolver: nightly-2017-01-31 -packages: -- '.' -extra-deps: -- aeson-0.11.3.0 -- bower-json-1.0.0.1 -- http-client-0.4.31.2 -- http-client-tls-0.2.4.1 -- optparse-applicative-0.13.0.0 -- pipes-4.1.9 -- pipes-http-1.0.2 -- turtle-1.3.1 -- wai-websockets-3.0.0.9 -- websockets-0.9.6.2 diff --git a/stack-ghc-8.0.yaml b/stack-ghc-8.0.yaml index 532fcb926d..3dc2cc64f8 100644 --- a/stack-ghc-8.0.yaml +++ b/stack-ghc-8.0.yaml @@ -1,10 +1,13 @@ -resolver: lts-7.9 +resolver: nightly-2017-01-31 packages: - '.' extra-deps: -- aeson-better-errors-0.9.1.0 +- aeson-0.11.3.0 - bower-json-1.0.0.1 +- http-client-0.4.31.2 +- http-client-tls-0.2.4.1 - optparse-applicative-0.13.0.0 +- pipes-4.1.9 - pipes-http-1.0.2 - turtle-1.3.1 - wai-websockets-3.0.0.9 From 9748e68b70dec28e5c17bc8b71c1c79d6aac6e2b Mon Sep 17 00:00:00 2001 From: Hyunje Jun Date: Wed, 1 Feb 2017 00:18:20 +0900 Subject: [PATCH 5/5] Make Data.Aeson.BetterErrors imports explicit --- src/Language/PureScript/Docs/RenderedCode/Types.hs | 2 +- src/Language/PureScript/Docs/Types.hs | 6 +++++- src/Language/PureScript/Publish.hs | 2 +- src/Language/PureScript/Publish/ErrorsWarnings.hs | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Language/PureScript/Docs/RenderedCode/Types.hs b/src/Language/PureScript/Docs/RenderedCode/Types.hs index 8a63d62d2b..0d64e301b1 100644 --- a/src/Language/PureScript/Docs/RenderedCode/Types.hs +++ b/src/Language/PureScript/Docs/RenderedCode/Types.hs @@ -50,7 +50,7 @@ import Control.DeepSeq (NFData) import Control.Monad.Error.Class (MonadError(..)) import Data.Monoid ((<>)) -import Data.Aeson.BetterErrors +import Data.Aeson.BetterErrors (Parse, nth, withText, withValue, toAesonParser, perhaps, asText, eachInArray) import qualified Data.Aeson as A import Data.Text (Text) import qualified Data.Text as T diff --git a/src/Language/PureScript/Docs/Types.hs b/src/Language/PureScript/Docs/Types.hs index 6697085d0c..f18648b96a 100644 --- a/src/Language/PureScript/Docs/Types.hs +++ b/src/Language/PureScript/Docs/Types.hs @@ -10,7 +10,11 @@ import Prelude (String, unlines, lookup) import Control.Arrow ((***)) import Data.Aeson ((.=)) -import Data.Aeson.BetterErrors hiding ((<|>)) +import Data.Aeson.BetterErrors + (Parse, ParseError, parse, keyOrDefault, throwCustomError, key, asText, + keyMay, withString, eachInArray, asNull, (.!), toAesonParser, toAesonParser', + fromAesonParser, perhaps, withText, asIntegral, nth, eachInObjectWithKey, + asString) import qualified Data.Map as Map import Data.Time.Clock (UTCTime) import qualified Data.Time.Format as TimeFormat diff --git a/src/Language/PureScript/Publish.hs b/src/Language/PureScript/Publish.hs index 9ab21cad5a..aa067061a4 100644 --- a/src/Language/PureScript/Publish.hs +++ b/src/Language/PureScript/Publish.hs @@ -27,7 +27,7 @@ import Control.Category ((>>>)) import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT) import Control.Monad.Writer.Strict (MonadWriter, WriterT, runWriterT, tell) -import Data.Aeson.BetterErrors +import Data.Aeson.BetterErrors (Parse, parse, keyMay, eachInObjectWithKey, eachInObject, key, keyOrDefault, asBool, asText) import Data.Char (isSpace) import Data.String (String, lines) import Data.List (stripPrefix, (\\), nubBy) diff --git a/src/Language/PureScript/Publish/ErrorsWarnings.hs b/src/Language/PureScript/Publish/ErrorsWarnings.hs index e2507d934e..c2f8225352 100644 --- a/src/Language/PureScript/Publish/ErrorsWarnings.hs +++ b/src/Language/PureScript/Publish/ErrorsWarnings.hs @@ -17,7 +17,7 @@ import Prelude.Compat import Control.Exception (IOException) -import Data.Aeson.BetterErrors +import Data.Aeson.BetterErrors (ParseError, displayError) import Data.List (intersperse, intercalate) import Data.List.NonEmpty (NonEmpty(..)) import Data.Maybe