From addfbdb327f2d45b70422c2bccf0cdc8618c5b91 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 18 Feb 2018 18:06:16 -0800
Subject: Rename `docsJar` -> `docJar`

---
 main/test/src/mill/util/ParseArgsTest.scala            | 18 +++++++++---------
 readme.md                                              |  4 ++--
 scalalib/src/mill/scalalib/PublishModule.scala         |  4 ++--
 scalalib/src/mill/scalalib/ScalaModule.scala           |  2 +-
 .../src/mill/scalalib/publish/LocalPublisher.scala     |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/main/test/src/mill/util/ParseArgsTest.scala b/main/test/src/mill/util/ParseArgsTest.scala
index caa1afec..3933f2af 100644
--- a/main/test/src/mill/util/ParseArgsTest.scala
+++ b/main/test/src/mill/util/ParseArgsTest.scala
@@ -43,14 +43,14 @@ object ParseArgsTest extends TestSuite {
         multiSelect = false
       )
       'multiSelectors - check(
-        input = Seq("core.jar", "core.docsJar", "core.sourcesJar"),
-        expectedSelectors = Seq("core.jar", "core.docsJar", "core.sourcesJar"),
+        input = Seq("core.jar", "core.docJar", "core.sourcesJar"),
+        expectedSelectors = Seq("core.jar", "core.docJar", "core.sourcesJar"),
         expectedArgs = Seq.empty,
         multiSelect = true
       )
       'multiSelectorsSeq - check(
-        input = Seq("core.jar", "core.docsJar", "core.sourcesJar"),
-        expectedSelectors = Seq("core.jar", "core.docsJar", "core.sourcesJar"),
+        input = Seq("core.jar", "core.docJar", "core.sourcesJar"),
+        expectedSelectors = Seq("core.jar", "core.docJar", "core.sourcesJar"),
         expectedArgs = Seq.empty,
         multiSelect = true
       )
@@ -89,16 +89,16 @@ object ParseArgsTest extends TestSuite {
         List("application.compile", "core.compile")
       )
       'expandRight - check(
-        "application.{jar,docsJar,sourcesJar}",
-        List("application.jar", "application.docsJar", "application.sourcesJar")
+        "application.{jar,docJar,sourcesJar}",
+        List("application.jar", "application.docJar", "application.sourcesJar")
       )
       'expandBoth - check(
-        "{core,application}.{jar,docsJar}",
+        "{core,application}.{jar,docJar}",
         List(
           "core.jar",
-          "core.docsJar",
+          "core.docJar",
           "application.jar",
-          "application.docsJar"
+          "application.docJar"
         )
       )
       'expandNested - {
diff --git a/readme.md b/readme.md
index d520c454..f79deacf 100644
--- a/readme.md
+++ b/readme.md
@@ -209,7 +209,7 @@ Targets:
     .compilerBridge()
     .crossFullScalaVersion()
     .depClasspath()
-    .docsJar()
+    .docJar()
     .externalCompileDepClasspath()
     .externalCompileDepSources()
 ...
@@ -236,7 +236,7 @@ Targets:
     .compilerBridge()
     .crossFullScalaVersion()
     .depClasspath()
-    .docsJar()
+    .docJar()
     .externalCompileDepClasspath()
     .externalCompileDepSources()
 ...
diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala
index d0741128..87c8ee32 100644
--- a/scalalib/src/mill/scalalib/PublishModule.scala
+++ b/scalalib/src/mill/scalalib/PublishModule.scala
@@ -50,7 +50,7 @@ trait PublishModule extends ScalaModule { outer =>
     LocalPublisher.publish(
       jar = jar().path,
       sourcesJar = sourceJar().path,
-      docsJar = docsJar().path,
+      docJar = docJar().path,
       pom = pom().path,
       ivy = ivy().path,
       artifact = artifactMetadata()
@@ -68,7 +68,7 @@ trait PublishModule extends ScalaModule { outer =>
       Seq(
         jar() -> s"$baseName.jar",
         sourceJar() -> s"$baseName-sources.jar",
-        docsJar() -> s"$baseName-javadoc.jar",
+        docJar() -> s"$baseName-javadoc.jar",
         pom() -> s"$baseName.pom"
       )
     )
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index f1910103..dd9fa91e 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -172,7 +172,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer =>
     )
   }
 
-  def docsJar = T {
+  def docJar = T {
     val outDir = T.ctx().dest
 
     val javadocDir = outDir / 'javadoc
diff --git a/scalalib/src/mill/scalalib/publish/LocalPublisher.scala b/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
index a9957e5c..a8a703fc 100644
--- a/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
+++ b/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
@@ -8,7 +8,7 @@ object LocalPublisher {
 
   def publish(jar: Path,
               sourcesJar: Path,
-              docsJar: Path,
+              docJar: Path,
               pom: Path,
               ivy: Path,
               artifact: Artifact): Unit = {
@@ -16,7 +16,7 @@ object LocalPublisher {
     writeFiles(
       jar -> releaseDir / "jars" / s"${artifact.id}.jar",
       sourcesJar -> releaseDir / "srcs" / s"${artifact.id}-sources.jar",
-      docsJar -> releaseDir / "docs" / s"${artifact.id}-javadoc.jar",
+      docJar -> releaseDir / "docs" / s"${artifact.id}-javadoc.jar",
       pom -> releaseDir / "poms" / s"${artifact.id}.pom",
       ivy -> releaseDir / "ivys" / "ivy.xml"
     )
-- 
cgit v1.2.3