From 37fd5e9de133dc157cdaa6d432700b93324680fe Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sat, 11 Nov 2017 20:18:01 -0800
Subject: - Smoothed out syntax for defining ivy dependencies - Made `build.sc`
 file directly runnable using Ammonite, without any wrapper

---
 build.sc | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 build.sc

(limited to 'build.sc')

diff --git a/build.sc b/build.sc
old mode 100644
new mode 100755
index 0ce695c7..15e958ff
--- a/build.sc
+++ b/build.sc
@@ -1,13 +1,13 @@
-import $cp.scalaplugin.target.`scala-2.12`.classes
+#!/usr/bin/env amm
+import $cp.scalaplugin.target.`scala-2.12`.`mill-scalaplugin-assembly-0.1-SNAPSHOT.jar`
 import ammonite.ops.pwd
-import coursier.{Dependency => Dep, Module => Mod}
 import mill.discover.Discovered
 import mill.eval.{Evaluator, PathRef}
-import mill.scalaplugin.Subproject.ScalaDep
+import mill.scalaplugin.Subproject.Dep
 import mill.util.OSet
 import mill.{T, _}
 import mill.scalaplugin.{TestRunner, _}
-
+@main def main(args: String*) = mill.Main(args, Build)
 object Build{
   trait MillSubproject extends Subproject{
     def scalaVersion = T{ "2.12.4" }
@@ -16,19 +16,19 @@ object Build{
   object Core extends MillSubproject {
 
     override def compileIvyDeps = T{
-      Seq[ScalaDep](
-        Dep(Mod("org.scala-lang", "scala-reflect"), scalaVersion(), configuration = "provided")
+      Seq(
+        Dep.Java("org.scala-lang", "scala-reflect", scalaVersion())
       )
     }
 
     override def ivyDeps = T{
-      Seq[ScalaDep](
-        ScalaDep(Dep(Mod("com.lihaoyi", "sourcecode"), "0.1.4")),
-        ScalaDep(Dep(Mod("com.lihaoyi", "pprint"), "0.5.3")),
-        ScalaDep.Point(Dep(Mod("com.lihaoyi", "ammonite"), "1.0.3")),
-        ScalaDep(Dep(Mod("com.typesafe.play", "play-json"), "2.6.6")),
-        ScalaDep(Dep(Mod("org.scala-sbt", "zinc"), "1.0.3")),
-        Dep(Mod("org.scala-sbt", "test-interface"), "1.0")
+      Seq(
+        Dep("com.lihaoyi", "sourcecode", "0.1.4"),
+        Dep("com.lihaoyi", "pprint", "0.5.3"),
+        Dep.Point("com.lihaoyi", "ammonite", "1.0.3"),
+        Dep("com.typesafe.play", "play-json", "2.6.6"),
+        Dep("org.scala-sbt", "zinc", "1.0.3"),
+        Dep.Java("org.scala-sbt", "test-interface", "1.0")
       )
     }
 
@@ -40,12 +40,11 @@ object Build{
     def basePath = T{ pwd / 'scalaplugin }
     override def sources = T{ pwd/'core/'src/'test/'scala }
     override def ivyDeps = T{
-      Seq[ScalaDep](
-        ScalaDep(Dep(Mod("com.lihaoyi", "utest"), "0.6.0"))
+      Seq[Dep](
+        Dep("com.lihaoyi", "utest", "0.6.0")
       )
     }
     def test() = T.command{
-      pprint.log(runDepClasspath().map(_.path.toString), height=999)
       TestRunner.apply(
         "mill.UTestFramework",
         runDepClasspath().map(_.path) :+ compiled().path,
@@ -60,4 +59,5 @@ object Build{
     override def sources = T{ pwd/'scalaplugin/'src/'main/'scala }
   }
 }
-@main def main(): Any = Build -> mill.discover.Discovered[Build.type]
+
+
-- 
cgit v1.2.3