Merge branch 'topic/updating-dependencies'

ethul · ethul · commit a56737105535 · 2014-04-27T21:24:46.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ bower_components
 js
 externs
 dist
+output
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-free",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "homepage": "https://github.com/purescript-contrib/purescript-free",
   "description": "Free monads",
   "keywords": ["purescript"],
@@ -15,6 +15,6 @@
     "dist"
   ],
   "dependencies": {
-    "purescript-transformers": "*"
+    "purescript-transformers": "64fa7200dc328fc79090426cddb64ed6e4ccffc9"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -46,7 +46,7 @@ gulp.task('make', function(){
   return (
     gulp.src(config.purescript.src).
     pipe(plumber()).
-    pipe(purescript.pscMake()).
+    pipe(purescript.pscMake({output: config.purescript.dest})).
     on('error', error)
   );
 });
diff --git a/package.json b/package.json
@@ -6,6 +6,6 @@
     "gulp-clean": "^0.2.4",
     "gulp-util": "^2.2.14",
     "gulp-plumber": "^0.5.6",
-    "gulp-purescript": "^0.0.1"
+    "gulp-purescript": "^0.0.4"
   }
 }

-Original file line number
+Diff line change
 js
 externs
 dist
 +output
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "purescript-free",`
`3`		`- "version": "0.0.5",`
	`3`	`+ "version": "0.0.6",`
`4`	`4`	`"homepage": "https://github.com/purescript-contrib/purescript-free",`
`5`	`5`	`"description": "Free monads",`
`6`	`6`	`"keywords": ["purescript"],`
`@@ -15,6 +15,6 @@`
`15`	`15`	`"dist"`
`16`	`16`	`],`
`17`	`17`	`"dependencies": {`
`18`		`- "purescript-transformers": "*"`
	`18`	`+ "purescript-transformers": "64fa7200dc328fc79090426cddb64ed6e4ccffc9"`
`19`	`19`	`}`
`20`	`20`	`}`