Skip to content

Commit ce50702

Browse files
committed
Merge pull request #43 from garyb/psc-0.7.4-update
Update for PureScript 0.7.4
2 parents c907050 + 4f42576 commit ce50702

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ language: node_js
22
sudo: false
33
node_js:
44
- 0.10
5-
env:
6-
- TAG=v0.7.0 PATH=$HOME/bin:$PATH
75
install:
8-
- mkdir $HOME/bin
9-
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
10-
- tar zxvf $HOME/purescript.tar.gz -C $HOME/bin purescript/psc{,i,-docs,-bundle,-publish} --strip-components=1
11-
- chmod a+x $HOME/bin/psc{,i,-docs,-bundle,-publish}
126
- npm install bower gulp -g
137
- npm install && bower install
148
script:

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"package.json"
2424
],
2525
"dependencies": {
26-
"purescript-aff": "^0.11.0",
26+
"purescript-aff": "^0.12.0",
2727
"purescript-arraybuffer-types": "^0.2.0",
2828
"purescript-dom": "^0.2.0",
2929
"purescript-foreign": "^0.7.0",

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"private": true,
33
"devDependencies": {
4+
"body-parser": "^1.13.2",
5+
"express": "^4.13.1",
46
"gulp": "^3.8.11",
57
"gulp-jscs": "^1.6.0",
68
"gulp-jshint": "^1.11.2",
79
"gulp-plumber": "^1.0.0",
810
"gulp-purescript": "^0.6.0",
9-
"express": "^4.13.1",
10-
"body-parser": "^1.13.2",
11+
"purescript": "^0.7.4-rc.2",
1112
"xmlhttprequest": "^1.7.0"
1213
}
1314
}

src/Network/HTTP/Affjax.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import Control.Monad.Eff.Exception (Error(), error)
2828
import Control.Monad.Eff.Ref (REF(), newRef, readRef, writeRef)
2929
import Control.Monad.Error.Class (throwError)
3030
import Data.Either (Either(..), either)
31-
import Data.Foreign (Foreign(..), F(), parseJSON, readString)
31+
import Data.Foreign (Foreign(), F(), parseJSON, readString)
3232
import Data.Function (Fn5(), runFn5, Fn4(), runFn4)
3333
import Data.Int (toNumber, round)
3434
import Data.Maybe (Maybe(..), maybe)
@@ -174,7 +174,7 @@ retry policy run req = do
174174
Just failure -> either throwError pure failure
175175
Just resp -> pure resp
176176
where
177-
retryState :: Either _ _ -> RetryState _ _
177+
retryState :: Either Error (AffjaxResponse b) -> RetryState Error (AffjaxResponse b)
178178
retryState (Left exn) = Left $ Left exn
179179
retryState (Right resp) =
180180
case resp.status of

0 commit comments

Comments
 (0)