summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-10-31 21:06:30 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2017-10-31 21:06:30 -0700
commit2482a37652e9e50759b6357e3f078616c6365941 (patch)
tree7808d1fcf2248f05f2aeb9f6cad7217ba7cabb13 /src/main
parentf63535b955941e1a9a0f84abeaf53bb2f2cc2fc4 (diff)
downloadmill-2482a37652e9e50759b6357e3f078616c6365941.tar.gz
mill-2482a37652e9e50759b6357e3f078616c6365941.tar.bz2
mill-2482a37652e9e50759b6357e3f078616c6365941.zip
first MetacircularTest (evaluating `scalaVersion`) passes. Subsequent tests still fail due to NPE
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/forge/Target.scala2
-rw-r--r--src/main/scala/forge/package.scala2
-rw-r--r--src/main/scala/forge/scalaplugin/Subproject.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/forge/Target.scala b/src/main/scala/forge/Target.scala
index 01b76d47..56157584 100644
--- a/src/main/scala/forge/Target.scala
+++ b/src/main/scala/forge/Target.scala
@@ -35,7 +35,7 @@ object Target{
}
class Target1[T](t: => Target[T]) extends Target[T]{
lazy val t0 = t
- val inputs = t0.inputs
+ lazy val inputs = t0.inputs
def evaluate(args: Args) = t0.evaluate(args)
}
implicit def toTarget[T](t: T): Target[T] = new Target0(t)
diff --git a/src/main/scala/forge/package.scala b/src/main/scala/forge/package.scala
index 1a07c846..621f2345 100644
--- a/src/main/scala/forge/package.scala
+++ b/src/main/scala/forge/package.scala
@@ -55,7 +55,7 @@ package object forge {
}
implicit val crFormat: Format[ammonite.ops.CommandResult] = Json.format
- implicit val depFormat: Format[coursier.Dependency] = Json.format
implicit val modFormat: Format[coursier.Module] = Json.format
+ implicit val depFormat: Format[coursier.Dependency] = Json.format
implicit val attrFormat: Format[coursier.Attributes] = Json.format
}
diff --git a/src/main/scala/forge/scalaplugin/Subproject.scala b/src/main/scala/forge/scalaplugin/Subproject.scala
index b548c559..cca60732 100644
--- a/src/main/scala/forge/scalaplugin/Subproject.scala
+++ b/src/main/scala/forge/scalaplugin/Subproject.scala
@@ -134,5 +134,5 @@ abstract class Subproject {
}
val classpath = T{ for((r, c) <- resources.zip(compiled)) yield Seq(r, c) }
- val jar = T{ createJar(classpath) }
+// val jar = T{ createJar(classpath) }
}