diff options
| -rwxr-xr-x | ci/publish-docs.sh | 2 | ||||
| -rw-r--r-- | docs/build.sc | 38 | ||||
| -rw-r--r-- | docs/pages/1 - Intro to Mill.md | 4 | ||||
| -rw-r--r-- | integration/test/src/mill/integration/forked/Tests.scala | 1 | ||||
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/Versions.scala | 2 |
6 files changed, 25 insertions, 24 deletions
diff --git a/ci/publish-docs.sh b/ci/publish-docs.sh index 869f2e8d..2675d6f5 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.1.0/2.12-1.1.0 && chmod +x ~/bin/amm +curl -L -o ~/bin/amm https://github.com/lihaoyi/Ammonite/releases/download/1.4.0/2.12-1.4.0 && chmod +x ~/bin/amm cd docs diff --git a/docs/build.sc b/docs/build.sc index 661aa462..ffe3ac33 100644 --- a/docs/build.sc +++ b/docs/build.sc @@ -9,14 +9,14 @@ import collection.JavaConverters._ import org.pegdown.{PegDownProcessor, ToHtmlSerializer, LinkRenderer, Extensions} import org.pegdown.ast.{VerbatimNode, ExpImageNode, HeaderNode, TextNode, SimpleNode, TableNode} -val postsFolder = cwd/'pages +val postsFolder = os.pwd/'pages interp.watch(postsFolder) -val targetFolder = cwd/'target +val targetFolder = os.pwd/'target -val (markdownFiles, otherFiles) = ls! postsFolder partition (_.ext == "md") +val (markdownFiles, otherFiles) = os.list(postsFolder).partition(_.ext == "md") markdownFiles.foreach(println) // Walk the posts/ folder and parse out the name, full- and first-paragraph- // HTML of each post to be used on their respective pages and on the index @@ -30,7 +30,7 @@ val posts = { val processor = new PegDownProcessor( Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES | Extensions.AUTOLINKS ) - val ast = processor.parseMarkdown(read! path toArray) + val ast = processor.parseMarkdown(os.read(path).toArray) val headers = collection.mutable.Buffer.empty[(String, Int)] class Serializer extends ToHtmlSerializer(new LinkRenderer){ override def printImageTag(rendering: LinkRenderer.Rendering) { @@ -134,21 +134,21 @@ def formatRssDate(date: java.time.LocalDate) = { @main def main(publish: Boolean = false) = { - os.remove.all! targetFolder + os.remove.all(targetFolder) - os.makeDir.all! targetFolder/'page + os.makeDir.all(targetFolder/'page) for(otherFile <- otherFiles){ os.copy(otherFile, targetFolder/'page/(otherFile relativeTo postsFolder)) } - os.copy(pwd/"favicon.png", targetFolder/"favicon.ico") - os.copy(pwd/"logo-white.svg", targetFolder/"logo-white.svg") - os.copy(pwd/"VisualizeCompile.svg", targetFolder/"VisualizeCompile.svg") - os.copy(pwd/"VisualizeCore.svg", targetFolder/"VisualizeCore.svg") - os.copy(pwd/"VisualizePlan.svg", targetFolder/"VisualizePlan.svg") + os.copy(os.pwd/"favicon.png", targetFolder/"favicon.ico") + os.copy(os.pwd/"logo-white.svg", targetFolder/"logo-white.svg") + os.copy(os.pwd/"VisualizeCompile.svg", targetFolder/"VisualizeCompile.svg") + os.copy(os.pwd/"VisualizeCore.svg", targetFolder/"VisualizeCore.svg") + os.copy(os.pwd/"VisualizePlan.svg", targetFolder/"VisualizePlan.svg") - %('zip, "-r", targetFolder/"example-1.zip", "example-1")(pwd) - %('zip, "-r", targetFolder/"example-2.zip", "example-2")(pwd) + os.proc('zip, "-r", targetFolder/"example-1.zip", "example-1").call() + os.proc('zip, "-r", targetFolder/"example-2.zip", "example-2").call() for(i <- posts.indices){ val post = posts(i) @@ -184,11 +184,11 @@ def main(publish: Boolean = false) = { } if (publish){ - implicit val wd = cwd/'target - %git 'init - %git('add, "-A", ".") - %git('commit, "-am", "first commit") - %git('remote, 'add, 'origin, "git@github.com:lihaoyi/mill.git") - %git('push, "-uf", 'origin, "master:gh-pages") + implicit val wd = os.pwd/'target + os.proc("git", 'init).call() + os.proc("git", 'add, "-A", ".").call() + os.proc("git", 'commit, "-am", "first commit").call() + os.proc("git", 'remote, 'add, 'origin, "git@github.com:lihaoyi/mill.git").call() + os.proc("git", 'push, "-uf", 'origin, "master:gh-pages").call() } }
\ No newline at end of file diff --git a/docs/pages/1 - Intro to Mill.md b/docs/pages/1 - Intro to Mill.md index 7af0436b..5619932b 100644 --- a/docs/pages/1 - Intro to Mill.md +++ b/docs/pages/1 - Intro to Mill.md @@ -36,7 +36,7 @@ pacaur -S mill ### Windows To get started, download Mill from: -https://github.com/lihaoyi/mill/releases/download/0.2.8/0.2.8, and save it as +https://github.com/lihaoyi/mill/releases/download/0.3.4/0.3.4, and save it as `mill.bat`. If you're using [Scoop](https://scoop.sh) you can install Mill via @@ -73,7 +73,7 @@ To get started, download Mill and install it into your system via the following `curl`/`chmod` command: ```bash -sudo sh -c '(echo "#!/usr/bin/env sh" && curl -L https://github.com/lihaoyi/mill/releases/download/0.2.8/0.2.8) > /usr/local/bin/mill && chmod +x /usr/local/bin/mill' +sudo sh -c '(echo "#!/usr/bin/env sh" && curl -L https://github.com/lihaoyi/mill/releases/download/0.3.4/0.3.4) > /usr/local/bin/mill && chmod +x /usr/local/bin/mill' ``` ### Development Releases diff --git a/integration/test/src/mill/integration/forked/Tests.scala b/integration/test/src/mill/integration/forked/Tests.scala index bc2d0d6d..41844b58 100644 --- a/integration/test/src/mill/integration/forked/Tests.scala +++ b/integration/test/src/mill/integration/forked/Tests.scala @@ -1,6 +1,7 @@ package mill.integration.forked object AcyclicTests extends mill.integration.AcyclicTests(fork = true) +object AmmoniteTests extends mill.integration.AmmoniteTests(fork = true) object BetterFilesTests extends mill.integration.BetterFilesTests(fork = true) object JawnTests extends mill.integration.JawnTests(fork = true) object UpickleTests extends mill.integration.UpickleTests(fork = true) @@ -151,7 +151,7 @@ optimizer without classpath conflicts. ## Changelog -### master +### 0.3.4 - Mill is now bundled with [OS-Lib](https://github.com/lihaoyi/os-lib), providing a simpler way of dealing with filesystem APIs and subprocesses diff --git a/scalalib/src/mill/scalalib/Versions.scala b/scalalib/src/mill/scalalib/Versions.scala index 6066466b..b93e0df1 100644 --- a/scalalib/src/mill/scalalib/Versions.scala +++ b/scalalib/src/mill/scalalib/Versions.scala @@ -2,7 +2,7 @@ package mill.scalalib object Versions { // Keep synchronized with ammonite dependency in core in build.sc - val ammonite = "1.3.2" + val ammonite = "1.4.0" // Keep synchronized with zinc dependency in scalalib.worker in build.sc val zinc = "1.2.1" } |