Merge from lihaoyi/mill

.appveyor.yml

@@ -33,15 +33,15 @@ build_script:
       cmd /C C:\mill\out\release\dest\mill.bat -i all main.test scalajslib.test)
   - if [%COMPILER%]==[msys2] (
       SET "PATH=%JAVA_HOME%\bin;C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%" &&
-      C:\%MSYS2_DIR%\usr\bin\bash -lc 'os.makeDir.all -p /usr/local/bin' &&
+      C:\%MSYS2_DIR%\usr\bin\bash -lc 'mkdir -p /usr/local/bin' &&
       C:\%MSYS2_DIR%\usr\bin\bash -lc "curl -Lo /usr/local/bin/mill %MILL_URL%" &&
       C:\%MSYS2_DIR%\usr\bin\bash -lc 'chmod +x /usr/local/bin/mill' &&
       C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && mill -i dev.assembly" &&
       RD /S /Q %USERPROFILE%\.mill &&
       C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && out/dev/assembly/dest/mill.bat -i all main.test scalajslib.test")
   - if [%COMPILER%]==[cygwin] (
       SET "PATH=%JAVA_HOME%\bin;C:\%CYGWIN_DIR%\bin;C:\%CYGWIN_DIR%\usr\bin;%PATH%" &&
-      C:\%CYGWIN_DIR%\bin\bash -lc 'os.makeDir.all -p /usr/local/bin' &&
+      C:\%CYGWIN_DIR%\bin\bash -lc 'mkdir -p /usr/local/bin' &&
       C:\%CYGWIN_DIR%\bin\bash -lc "curl -Lo /usr/local/bin/mill %MILL_URL%" &&
       C:\%CYGWIN_DIR%\bin\bash -lc 'sed -i '"'"'0,/-cp "\$0"/{s/-cp "\$0"/-cp `cygpath -w "\$0"`/}; 0,/-cp "\$0"/{s/-cp "\$0"/-cp `cygpath -w "\$0"`/}'"'"' /usr/local/bin/mill' &&
       C:\%CYGWIN_DIR%\bin\bash -lc 'chmod +x /usr/local/bin/mill' &&

build.sc

@@ -8,7 +8,6 @@ import mill._
 import mill.scalalib._
 import publish._
 import mill.modules.Jvm.createAssembly
-import upickle.Js
 trait MillPublishModule extends PublishModule{
 
   def artifactName = "mill-" + super.artifactName()
@@ -27,15 +26,16 @@ trait MillPublishModule extends PublishModule{
 
   def javacOptions = Seq("-source", "1.8", "-target", "1.8")
 }
-
-trait MillModule extends MillPublishModule with ScalaModule{ outer =>
-  def scalaVersion = T{ "2.12.6" }
+trait MillApiModule extends MillPublishModule with ScalaModule{
+  def scalaVersion = T{ "2.12.8" }
   def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
   def scalacOptions = Seq("-P:acyclic:force")
   def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
   def repositories = super.repositories ++ Seq(
     MavenRepository("https://oss.sonatype.org/content/repositories/releases")
   )
+}
+trait MillModule extends MillApiModule{ outer =>
   def scalacPluginClasspath =
     super.scalacPluginClasspath() ++ Seq(main.moduledefs.jar())
 
@@ -78,17 +78,22 @@ object main extends MillModule {
       Seq(PathRef(shared.generateCoreTestSources(T.ctx().dest)))
     }
   }
-
+  object api extends MillApiModule{
+    def ivyDeps = Agg(
+      ivy"com.lihaoyi::os-lib:0.2.6",
+      ivy"com.lihaoyi::upickle:0.7.1",
+    )
+  }
   object core extends MillModule {
-    def moduleDeps = Seq(moduledefs)
+    def moduleDeps = Seq(moduledefs, api)
 
     def compileIvyDeps = Agg(
       ivy"org.scala-lang:scala-reflect:${scalaVersion()}"
     )
 
     def ivyDeps = Agg(
       // Keep synchronized with ammonite in Versions.scala
-      ivy"com.lihaoyi:::ammonite:1.4.2",
+      ivy"com.lihaoyi:::ammonite:1.6.0",
       // Necessary so we can share the JNA classes throughout the build process
       ivy"net.java.dev.jna:jna:4.5.0",
       ivy"net.java.dev.jna:jna-platform:4.5.0"
@@ -100,7 +105,7 @@ object main extends MillModule {
   }
 
   object moduledefs extends MillPublishModule with ScalaModule{
-    def scalaVersion = T{ "2.12.6" }
+    def scalaVersion = T{ "2.12.8" }
     def ivyDeps = Agg(
       ivy"org.scala-lang:scala-compiler:${scalaVersion()}",
       ivy"com.lihaoyi::sourcecode:0.1.4",
@@ -135,7 +140,7 @@ object main extends MillModule {
 
 
 object scalalib extends MillModule {
-  def moduleDeps = Seq(main)
+  def moduleDeps = Seq(main, scalalib.api)
 
   def ivyDeps = Agg(
     ivy"org.scala-sbt:test-interface:1.0"
@@ -173,23 +178,27 @@ object scalalib extends MillModule {
       )
     }
   }
-  object worker extends MillModule{
-    def moduleDeps = Seq(main, scalalib)
+  object api extends MillApiModule{
+    def moduleDeps = Seq(main.api)
+  }
+  object worker extends MillApiModule{
+
+    def moduleDeps = Seq(scalalib.api)
 
     def ivyDeps = Agg(
       // Keep synchronized with zinc in Versions.scala
-      ivy"org.scala-sbt::zinc:1.2.1"
+      ivy"org.scala-sbt::zinc:1.3.0-M1"
     )
-    def testArgs = Seq(
+    def testArgs = T{Seq(
       "-DMILL_SCALA_WORKER=" + runClasspath().map(_.path).mkString(",")
-    )
+    )}
   }
 }
 
 
 object scalajslib extends MillModule {
 
-  def moduleDeps = Seq(scalalib)
+  def moduleDeps = Seq(scalalib, scalajslib.api)
 
   def testArgs = T{
     val mapping = Map(
@@ -202,9 +211,12 @@ object scalajslib extends MillModule {
     (for((k, v) <- mapping.toSeq) yield s"-D$k=$v")
   }
 
+  object api extends MillApiModule{
+    def moduleDeps = Seq(main.core)
+  }
   object worker extends Cross[WorkerModule]("0.6", "1.0")
-  class WorkerModule(scalajsBinary: String) extends MillModule{
-    def moduleDeps = Seq(scalajslib)
+  class WorkerModule(scalajsBinary: String) extends MillApiModule{
+    def moduleDeps = Seq(scalajslib.api)
     def ivyDeps = scalajsBinary match {
       case "0.6" =>
         Agg(
@@ -233,6 +245,41 @@ object contrib extends MillModule {
 
   object twirllib extends MillModule {
     def moduleDeps = Seq(scalalib)
+  }
+
+  object playlib extends MillModule {
+    def moduleDeps = Seq(scalalib, twirllib, playlib.api)
+
+    def testArgs = T {
+      val mapping = Map(
+        "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_2_6" -> worker("2.6").compile().classes.path,
+        "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_2_7" -> worker("2.7").compile().classes.path
+      )
+
+      scalalib.worker.testArgs() ++
+        scalalib.backgroundwrapper.testArgs() ++
+        (for ((k, v) <- mapping.toSeq) yield s"-D$k=$v")
+    }
+
+    object api extends MillApiModule {
+      def moduleDeps = Seq(scalalib)
+    }
+    object worker extends Cross[WorkerModule]( "2.6", "2.7")
+
+    class WorkerModule(scalajsBinary: String) extends MillApiModule {
+      def moduleDeps = Seq(playlib.api)
+
+      def ivyDeps = scalajsBinary match {
+        case  "2.6"=>
+          Agg(
+            ivy"com.typesafe.play::routes-compiler::2.6.0"
+          )
+        case "2.7" =>
+          Agg(
+            ivy"com.typesafe.play::routes-compiler::2.7.0"
+          )
+      }
+    }
 
   }
 
@@ -258,7 +305,7 @@ object contrib extends MillModule {
 
 
 object scalanativelib extends MillModule {
-  def moduleDeps = Seq(scalalib)
+  def moduleDeps = Seq(scalalib, scalanativelib.api)
 
   def scalacOptions = Seq[String]() // disable -P:acyclic:force
 
@@ -274,11 +321,13 @@ object scalanativelib extends MillModule {
     scalalib.backgroundwrapper.testArgs() ++
     (for((k, v) <- mapping.toSeq) yield s"-D$k=$v")
   }
-
+  object api extends MillApiModule{
+    def moduleDeps = Seq(main.core)
+  }
   object worker extends Cross[WorkerModule]("0.3")
-  class WorkerModule(scalaNativeBinary: String) extends MillModule {
+  class WorkerModule(scalaNativeBinary: String) extends MillApiModule {
     def scalaNativeVersion = T{ "0.3.8" }
-    def moduleDeps = Seq(scalanativelib)
+    def moduleDeps = Seq(scalanativelib.api)
     def ivyDeps = scalaNativeBinary match {
       case "0.3" =>
         Agg(
@@ -338,9 +387,14 @@ def launcherScript(shellJvmArgs: Seq[String],
     shellCommands = {
       val jvmArgsStr = shellJvmArgs.mkString(" ")
       def java(mainClass: String) =
-        s"""exec java $jvmArgsStr $$JAVA_OPTS -cp "${shellClassPath.mkString(":")}" $mainClass "$$@""""
-
-      s"""case "$$1" in
+        s"""exec $$JAVACMD $jvmArgsStr $$JAVA_OPTS -cp "${shellClassPath.mkString(":")}" $mainClass "$$@""""
+
+      s"""if [ -z "$$JAVA_HOME" ] ; then
+         |  JAVACMD="java"
+         |else
+         |  JAVACMD="$$JAVA_HOME/bin/java"
+         |fi
+         |case "$$1" in
          |  -i | --interactive )
          |    ${java("mill.MillMain")}
          |    ;;
@@ -352,9 +406,11 @@ def launcherScript(shellJvmArgs: Seq[String],
     cmdCommands = {
       val jvmArgsStr = cmdJvmArgs.mkString(" ")
       def java(mainClass: String) =
-        s"""java $jvmArgsStr %JAVA_OPTS% -cp "${cmdClassPath.mkString(";")}" $mainClass %*"""
+        s""""%JAVACMD%" $jvmArgsStr %JAVA_OPTS% -cp "${cmdClassPath.mkString(";")}" $mainClass %*"""
 
-      s"""if "%1" == "-i" set _I_=true
+      s"""set "JAVACMD=java.exe"
+         |if not "%JAVA_HOME%"=="" set "JAVACMD=%JAVA_HOME%\\bin\\java.exe"
+         |if "%1" == "-i" set _I_=true
          |if "%1" == "--interactive" set _I_=true
          |if defined _I_ (
          |  ${java("mill.MillMain")}
@@ -521,7 +577,7 @@ def uploadToGithub(authKey: String) = T.command{
     scalaj.http.Http("https://api.github.com/repos/lihaoyi/mill/releases")
       .postData(
         ujson.write(
-          Js.Obj(
+          ujson.Js.Obj(
             "tag_name" -> releaseTag,
             "name" -> releaseTag
           )

ci/shared.sc

@@ -41,7 +41,7 @@ def generateTarget(dir: Path) = {
     val parameters = lowercases.zip(uppercases).map { case (lower, upper) => s"$lower: TT[$upper]" }.mkString(", ")
     val body       = uppercases.zipWithIndex.map { case (t, i) => s"args[$t]($i)" }.mkString(", ")
 
-    s"def zip[$typeArgs]($parameters) = makeT[($typeArgs)](Seq($zipArgs), (args: mill.util.Ctx) => ($body))"
+    s"def zip[$typeArgs]($parameters) = makeT[($typeArgs)](Seq($zipArgs), (args: mill.api.Ctx) => ($body))"
   }
 
   write(
@@ -50,7 +50,7 @@ def generateTarget(dir: Path) = {
        |import scala.language.higherKinds
        |trait TargetGenerated {
        |  type TT[+X]
-       |  def makeT[X](inputs: Seq[TT[_]], evaluate: mill.util.Ctx => mill.eval.Result[X]): TT[X]
+       |  def makeT[X](inputs: Seq[TT[_]], evaluate: mill.api.Ctx => mill.api.Result[X]): TT[X]
        |  ${(3 to 22).map(generate).mkString("\n")}
        |}""".stripMargin
   )
@@ -74,7 +74,7 @@ def generateEval(dir: Path) = {
     s"""package mill.main
        |import mill.eval.Evaluator
        |import mill.define.Task
-       |import mill.util.Strict.Agg
+       |import mill.api.Strict.Agg
        |class EvalGenerated(evaluator: Evaluator) {
        |  type TT[+X] = Task[X]
        |  ${(1 to 22).map(generate).mkString("\n")}

ci/test-mill-0.sh

@@ -6,4 +6,4 @@ set -eux
 git clean -xdf
 
 # Run tests
-mill -i all {main,scalalib,scalajslib,contrib.twirllib,main.client,contrib.scalapblib}.test
+mill -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.playlib,main.client,contrib.scalapblib}.test

ci/test-mill-bootstrap.sh

@@ -27,4 +27,4 @@ git clean -xdf
 rm -rf ~/.mill
 
 # Use second build to run tests using Mill
-~/mill-2 -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.scalapblib}.test
+~/mill-2 -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.playlib,contrib.scalapblib}.test

contrib/buildinfo/src/BuildInfo.scala

@@ -0,0 +1,47 @@
+package mill.contrib.buildinfo
+
+import mill.T
+import mill.define.Target
+import mill.api.{Ctx, Logger, PathRef}
+import mill.scalalib.ScalaModule
+
+trait BuildInfo extends ScalaModule {
+
+  def buildInfoPackageName: Option[String] = None
+
+  def buildInfoObjectName: String = "BuildInfo"
+
+  def buildInfoMembers: T[Map[String, String]] = T {
+    Map.empty[String, String]
+  }
+
+  private def generateBuildInfo(members: Map[String, Any])(implicit dest: Ctx.Dest, log: Ctx.Log): Seq[PathRef] =
+    if (!members.isEmpty) {
+      val outputFile = dest.dest / "BuildInfo.scala"
+      val internalMembers =
+        members
+          .map {
+            case (name, value) => s"""  def ${name} = "${value}""""
+          }
+          .mkString("\n")
+      log.log.debug(s"Generating object [${buildInfoPackageName.map(_ + ".").getOrElse("")}${buildInfoObjectName}] with [${members.size}] members to [${outputFile}]")
+      os.write(
+        outputFile,
+        s"""|${buildInfoPackageName.map(p => s"package ${p}").getOrElse("")}
+          |object ${buildInfoObjectName} {
+          |$internalMembers
+          |}""".stripMargin
+      )
+      Seq(PathRef(outputFile))
+    } else {
+      log.log.debug("No build info member defined, skipping code generation")
+      Seq.empty[PathRef]
+    }
+
+  def buildInfo = T {
+    generateBuildInfo(buildInfoMembers())
+  }
+
+  override def generatedSources: Target[Seq[PathRef]] = T { super.generatedSources() ++ buildInfo() }
+
+}

contrib/buildinfo/src/deprecated.scala

@@ -0,0 +1,4 @@
+package mill.contrib
+
+@deprecated("Moved to package mill.contrib.buildinfo", "0.3.7")
+trait BuildInfo extends mill.contrib.buildinfo.BuildInfo

contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala → contrib/buildinfo/test/src/BuildInfoTests.scala

@@ -1,9 +1,9 @@
-package mill.contrib
+package mill.contrib.buildinfo
 
 import java.util.jar.JarFile
 import mill._
 import mill.define.Target
-import mill.eval.Result._
+import mill.api.Result._
 import mill.eval.{Evaluator, Result}
 import mill.modules.Assembly
 import mill.scalalib.publish.VersionControl