diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8500fca..5cc57a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,7 @@ jobs: - name: Set up a PureScript toolchain uses: purescript-contrib/setup-purescript@main with: + purescript: "unstable" purs-tidy: "latest" - name: Cache PureScript dependencies @@ -35,8 +36,17 @@ jobs: - name: Install dev dependencies run: spago -x spago-dev.dhall install - - name: Run tests - run: spago -x spago-dev.dhall test --no-install +# - name: Run tests +# run: spago -x spago-dev.dhall test --no-install - name: Check formatting run: purs-tidy check src test bench + + - name: Verify Bower & Pulp + run: | + npm install bower pulp@16.0.0-0 + npx bower install + npx pulp build -- --censor-lib --strict + if [ -d "test" ]; then + npx pulp test + fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 376057d..37f2fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ Notable changes to this project are documented in this file. The format is based ## [Unreleased] Breaking changes: +- Update project and deps to PureScript v0.15.0 (#160 by @JordanMartinez) +- Drop deprecated `MonadZero` instance (#160 by @JordanMartinez) New features: diff --git a/bower.json b/bower.json index 7cb6c39..c0680b7 100644 --- a/bower.json +++ b/bower.json @@ -1,38 +1,41 @@ { - "name": "purescript-parsing", - "license": [ - "BSD-2-Clause" - ], - "repository": { - "type": "git", - "url": "https://github.com/purescript-contrib/purescript-parsing.git" - }, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "output" - ], - "dependencies": { - "purescript-arrays": "^v6.0.1", - "purescript-control": "^v5.0.0", - "purescript-either": "^v5.0.0", - "purescript-foldable-traversable": "^v5.0.1", - "purescript-identity": "^v5.0.0", - "purescript-integers": "^v5.0.0", - "purescript-lists": "^v6.0.1", - "purescript-math": "^v3.0.0", - "purescript-maybe": "^v5.0.0", - "purescript-newtype": "^v4.0.0", - "purescript-numbers": "^v8.0.0", - "purescript-prelude": "^v5.0.1", - "purescript-record": "^v3.0.0", - "purescript-strings": "^v5.0.0", - "purescript-tailrec": "^v5.0.1", - "purescript-transformers": "^v5.1.0", - "purescript-tuples": "^v6.0.1", - "purescript-unfoldable": "^v5.0.0", - "purescript-unicode": "^v5.0.0", - "purescript-unsafe-coerce": "^v5.0.0" - } + "name": "purescript-parsing", + "license": [ + "BSD-2-Clause" + ], + "repository": { + "type": "git", + "url": "https://github.com/purescript-contrib/purescript-parsing.git" + }, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "output" + ], + "dependencies": { + "purescript-arrays": "master", + "purescript-control": "master", + "purescript-either": "master", + "purescript-foldable-traversable": "master", + "purescript-identity": "master", + "purescript-integers": "master", + "purescript-lists": "master", + "purescript-math": "master", + "purescript-maybe": "master", + "purescript-newtype": "master", + "purescript-numbers": "master", + "purescript-prelude": "master", + "purescript-record": "master", + "purescript-strings": "master", + "purescript-tailrec": "master", + "purescript-transformers": "master", + "purescript-tuples": "master", + "purescript-unfoldable": "master", + "purescript-unicode": "main", + "purescript-unsafe-coerce": "master" + }, + "devDependencies": { + "purescript-assert": "master" + } } diff --git a/packages.dhall b/packages.dhall index 7a6905b..582d6d3 100644 --- a/packages.dhall +++ b/packages.dhall @@ -1,4 +1,4 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c + https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall in upstream diff --git a/src/Text/Parsing/Parser.purs b/src/Text/Parsing/Parser.purs index 69796f0..527ae1d 100644 --- a/src/Text/Parsing/Parser.purs +++ b/src/Text/Parsing/Parser.purs @@ -26,7 +26,7 @@ import Control.Monad.Except (class MonadError, ExceptT(..), mapExceptT, runExcep import Control.Monad.Rec.Class (class MonadRec) import Control.Monad.State (class MonadState, StateT(..), evalStateT, gets, mapStateT, modify_, runStateT) import Control.Monad.Trans.Class (class MonadTrans, lift) -import Control.MonadPlus (class Alternative, class MonadPlus, class MonadZero, class Plus) +import Control.MonadPlus (class Alternative, class MonadPlus, class Plus) import Data.Either (Either(..)) import Data.Identity (Identity) import Data.Newtype (class Newtype, over, unwrap) @@ -139,7 +139,7 @@ derive newtype instance monadErrorParserT :: Monad m => MonadError ParseError (P -- | -- | If we read a file from disk and run this `fileParser` on it and the -- | `string ""` parser succeeds, then we know that the first branch --- | is the correct branch, so we want to commit to the first branch. +-- | is the correct branch, so we want to commit to the first branch. -- | Even if the `parseTheRestOfTheHtml` parser fails -- | we don’t want to try the second branch. -- | @@ -164,8 +164,6 @@ instance plusParserT :: Monad m => Plus (ParserT s m) where instance alternativeParserT :: Monad m => Alternative (ParserT s m) -instance monadZeroParserT :: Monad m => MonadZero (ParserT s m) - instance monadPlusParserT :: Monad m => MonadPlus (ParserT s m) instance monadTransParserT :: MonadTrans (ParserT s) where