summaryrefslogtreecommitdiff
path: root/scalaplugin
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-05 07:08:02 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-05 07:08:02 -0800
commit9e1ba56eb49fb62d20fc4ede0627194304a854e8 (patch)
treeb5c9acd55034649f0ac480a29d7bdc2dce8dadb9 /scalaplugin
parent2fb5b569d30ac09cfda7ce6450c54d0fff6f32ae (diff)
downloadmill-9e1ba56eb49fb62d20fc4ede0627194304a854e8.tar.gz
mill-9e1ba56eb49fb62d20fc4ede0627194304a854e8.tar.bz2
mill-9e1ba56eb49fb62d20fc4ede0627194304a854e8.zip
Split out `ApplicativeMacros` from `Target`
Diffstat (limited to 'scalaplugin')
-rw-r--r--scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
index 2572e802..b28f1758 100644
--- a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
+++ b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
@@ -5,7 +5,7 @@ import java.io.File
import ammonite.ops.{Path, ls, mkdir, pwd}
import coursier.{Cache, Dependency, Fetch, MavenRepository, Module, Repository, Resolution}
-import forge.Target.Cacher
+import forge.define.Target.Cacher
import forge.eval.PathRef
import play.api.libs.json._
import sbt.internal.inc.{FreshCompilerCache, ScalaInstance, ZincUtil}
@@ -20,7 +20,7 @@ object Subproject{
sources: T[PathRef],
compileClasspath: T[Seq[PathRef]],
outputPath: T[Path]): T[PathRef] = {
- for((scalaVersion, sources, compileClasspath, outputPath) <- zip(scalaVersion, sources, compileClasspath, outputPath))
+ for((scalaVersion, sources, compileClasspath, outputPath) <- T.zip(scalaVersion, sources, compileClasspath, outputPath))
yield {
val binaryScalaVersion = scalaVersion.split('.').dropRight(1).mkString(".")
def grepJar(s: String) = {