Skip to content

Commit 046f814

Browse files
authored
Merge pull request #10 from justinwoo/ps-0.11
Update for Purescript 0.11
2 parents 0d29ea4 + b657076 commit 046f814

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

.travis.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js: 6
4+
node_js: stable
5+
env:
6+
- PATH=$HOME/purescript:$PATH
57
install:
8+
- TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
9+
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
10+
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
11+
- chmod a+x $HOME/purescript
612
- npm install -g bower
713
- npm install
14+
- bower install
815
script:
9-
- bower install --production
1016
- npm run -s build
11-
- bower install
12-
- npm -s test
1317
after_success:
14-
- >-
15-
test $TRAVIS_TAG &&
16-
echo $GITHUB_TOKEN | pulp login &&
17-
echo y | pulp publish --no-push
18+
- >-
19+
test $TRAVIS_TAG &&
20+
echo $GITHUB_TOKEN | pulp login &&
21+
echo y | pulp publish --no-push

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"package.json"
1515
],
1616
"dependencies": {
17-
"purescript-maybe": "^2.0.0",
18-
"purescript-functions": "^2.0.0"
17+
"purescript-maybe": "^3.0.0",
18+
"purescript-functions": "^3.0.0"
1919
},
2020
"repository": {
2121
"type": "git",
2222
"url": "git://github.com/paf31/purescript-nullable.git"
2323
},
2424
"devDependencies": {
25-
"purescript-console": "^2.0.0"
25+
"purescript-console": "^3.0.0"
2626
}
2727
}

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
"devDependencies": {
99
"jscs": "^2.8.0",
1010
"jshint": "^2.9.1",
11-
"pulp": "^9.0.1",
11+
"pulp": "^10.0.4",
1212
"purescript-psa": "^0.3.9",
13-
"purescript": "^0.10.1",
1413
"rimraf": "^2.5.0"
1514
}
1615
}

src/Data/Nullable.purs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Data.Maybe (Maybe(..), maybe)
1717
-- |
1818
-- | This type constructor may be useful when interoperating with JavaScript functions
1919
-- | which accept or return null values.
20-
foreign import data Nullable :: * -> *
20+
foreign import data Nullable :: Type -> Type
2121

2222
-- | The null value.
2323
foreign import null :: forall a. Nullable a
@@ -38,8 +38,8 @@ toMaybe n = runFn3 nullable n Nothing Just
3838
instance showNullable :: Show a => Show (Nullable a) where
3939
show = maybe "null" show <<< toMaybe
4040

41-
instance eqNullable :: (Eq a) => Eq (Nullable a) where
41+
instance eqNullable :: Eq a => Eq (Nullable a) where
4242
eq = eq `on` toMaybe
4343

44-
instance ordNullable :: (Ord a) => Ord (Nullable a) where
44+
instance ordNullable :: Ord a => Ord (Nullable a) where
4545
compare = compare `on` toMaybe

0 commit comments

Comments
 (0)