summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-03-25 21:24:10 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2018-03-25 21:24:10 -0700
commit25c26d00146c1dee15099cb9ebd332e96a788c66 (patch)
tree9dca560f74fa3fba663668abf6e8b3a615b38761
parent3d7b25d9e5ac9bb6e3ae8101772beccf6f95e41c (diff)
downloadmill-25c26d00146c1dee15099cb9ebd332e96a788c66.tar.gz
mill-25c26d00146c1dee15099cb9ebd332e96a788c66.tar.bz2
mill-25c26d00146c1dee15099cb9ebd332e96a788c66.zip
update build to ammonite 1.1.0 and mill 0.1.7
-rw-r--r--.travis.yml2
-rwxr-xr-xbuild.sc6
-rwxr-xr-xci/publish-docs.sh2
-rw-r--r--upload.sc6
4 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 3898dbfa..8d34956d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
jdk: oraclejdk8
script:
- - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.6/0.1.6 && chmod +x ~/bin/mill
+ - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7 && chmod +x ~/bin/mill
- export PATH=~/bin/mill:$PATH
- "$CI_SCRIPT"
diff --git a/build.sc b/build.sc
index e40b8511..661fc446 100755
--- a/build.sc
+++ b/build.sc
@@ -369,10 +369,10 @@ def uploadToGithub(authKey: String) = T.command{
if (releaseTag == label){
scalaj.http.Http("https://api.github.com/repos/lihaoyi/mill/releases")
.postData(
- upickle.json.write(
+ ujson.write(
Js.Obj(
- "tag_name" -> Js.Str(releaseTag),
- "name" -> Js.Str(releaseTag)
+ "tag_name" -> releaseTag,
+ "name" -> releaseTag
)
)
)
diff --git a/ci/publish-docs.sh b/ci/publish-docs.sh
index 9b0acbde..869f2e8d 100755
--- a/ci/publish-docs.sh
+++ b/ci/publish-docs.sh
@@ -2,7 +2,7 @@
set -eux
-curl -L -o ~/bin/amm https://github.com/lihaoyi/Ammonite/releases/download/1.0.3/2.12-1.0.3 && chmod +x ~/bin/amm
+curl -L -o ~/bin/amm https://github.com/lihaoyi/Ammonite/releases/download/1.1.0/2.12-1.1.0 && chmod +x ~/bin/amm
cd docs
diff --git a/upload.sc b/upload.sc
index 6013c8d9..d6aa96e2 100644
--- a/upload.sc
+++ b/upload.sc
@@ -22,7 +22,7 @@ def apply(uploadedFile: Path,
.header("Authorization", "token " + authKey)
.asString.body
- val parsed = upickle.json.read(body)
+ val parsed = ujson.read(body)
println(body)
@@ -41,7 +41,7 @@ def apply(uploadedFile: Path,
.asString
println(res.body)
- val longUrl = upickle.json.read(res.body)("browser_download_url").str.toString
+ val longUrl = ujson.read(res.body)("browser_download_url").str.toString
println("Long Url " + longUrl)
@@ -49,4 +49,4 @@ def apply(uploadedFile: Path,
println("Short Url " + shortUrl)
shortUrl
-} \ No newline at end of file
+}