diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/mill/define/Cross.scala | 16 | ||||
-rw-r--r-- | core/src/main/scala/mill/discover/Discovered.scala | 2 | ||||
-rw-r--r-- | core/src/test/scala/mill/discover/CrossModuleTests.scala | 18 | ||||
-rw-r--r-- | core/src/test/scala/mill/main/MainTests.scala | 8 |
4 files changed, 26 insertions, 18 deletions
diff --git a/core/src/main/scala/mill/define/Cross.scala b/core/src/main/scala/mill/define/Cross.scala index ac1ee966..85341d12 100644 --- a/core/src/main/scala/mill/define/Cross.scala +++ b/core/src/main/scala/mill/define/Cross.scala @@ -9,10 +9,18 @@ case class Cross[+T](items: List[(List[Any], T)]){ def map[V](f: T => V): Cross[V] = new Cross(items.map{case (l, v) => (l, f(v))}) def withFilter(f: T => Boolean): Cross[T] = new Cross(items.filter(t => f(t._2))) - def applyOpt(input: List[Any]): Option[T] = items.find(_._1 == input).map(_._2) - def apply(input: List[Any]): T = applyOpt(input).getOrElse( - throw new Exception("Unknown set of cross values: " + input + " not in known values\n" + items.map(_._1).mkString("\n")) - ) + def applyOpt(input: Any*): Option[T] = { + val inputList = input.toList + items.find(_._1 == inputList).map(_._2) + } + def apply(input: Any*): T = { + applyOpt(input:_*).getOrElse( + throw new Exception( + "Unknown set of cross values: " + input + + " not in known values\n" + items.map(_._1).mkString("\n") + ) + ) + } } object Cross{ def apply[T](t: T*) = new Cross(t.map(i => List(i) -> i).toList) diff --git a/core/src/main/scala/mill/discover/Discovered.scala b/core/src/main/scala/mill/discover/Discovered.scala index 36ec49b7..6bed7919 100644 --- a/core/src/main/scala/mill/discover/Discovered.scala +++ b/core/src/main/scala/mill/discover/Discovered.scala @@ -82,7 +82,7 @@ object Discovered { val base = q"${TermName(c.freshName())}" val ident = segments.reverse.zipWithIndex.foldLeft[Tree](base) { case (prefix, (Some(name), i)) => q"$prefix.${TermName(name)}" - case (prefix, (None, i)) => q"$prefix.apply($crossName($i))" + case (prefix, (None, i)) => q"$prefix.apply($crossName($i):_*)" } q"($base: $tpe, $crossName: List[List[Any]]) => $ident" } diff --git a/core/src/test/scala/mill/discover/CrossModuleTests.scala b/core/src/test/scala/mill/discover/CrossModuleTests.scala index c426d126..6c328a7e 100644 --- a/core/src/test/scala/mill/discover/CrossModuleTests.scala +++ b/core/src/test/scala/mill/discover/CrossModuleTests.scala @@ -31,7 +31,7 @@ object CrossModuleTests extends TestSuite{ val keys = gen(outer.crossed) assert(keys == List(List("2.10.6"), List("2.11.8"), List("2.12.4"))) for(k <- keys){ - assert(outer.crossed(k).scalaVersion == k.head) + assert(outer.crossed(k:_*).scalaVersion == k.head) } } 'doubleCross - { @@ -67,7 +67,7 @@ object CrossModuleTests extends TestSuite{ assert(keys == expectedKeys) for(k <- keys){ - val suffix = outer.crossed(k).suffix + val suffix = outer.crossed(k:_*).suffix val expected = k.map(_.toString).filter(_.nonEmpty).map("_"+_).mkString assert(suffix == expected) } @@ -89,9 +89,9 @@ object CrossModuleTests extends TestSuite{ assert(segments == expectedSegments) val targets = discovered.targets(outer).map(_.target) val expected = List( - outer.crossed(List("2.10.6")).scalaVersion, - outer.crossed(List("2.11.8")).scalaVersion, - outer.crossed(List("2.12.4")).scalaVersion + outer.crossed("2.10.6").scalaVersion, + outer.crossed("2.11.8").scalaVersion, + outer.crossed("2.12.4").scalaVersion ) assert(targets == expected) } @@ -108,10 +108,10 @@ object CrossModuleTests extends TestSuite{ val targets = discovered.targets(outer).map(_.target) val expected = List( - outer.crossed(List("sjs0.6", "2.11.8")).suffix, - outer.crossed(List("native0.3", "2.11.8")).suffix, - outer.crossed(List("sjs0.6", "2.12.4")).suffix, - outer.crossed(List("native0.3", "2.12.4")).suffix + outer.crossed("sjs0.6", "2.11.8").suffix, + outer.crossed("native0.3", "2.11.8").suffix, + outer.crossed("sjs0.6", "2.12.4").suffix, + outer.crossed("native0.3", "2.12.4").suffix ) assert(targets == expected) } diff --git a/core/src/test/scala/mill/main/MainTests.scala b/core/src/test/scala/mill/main/MainTests.scala index c0030e25..b9f2020f 100644 --- a/core/src/test/scala/mill/main/MainTests.scala +++ b/core/src/test/scala/mill/main/MainTests.scala @@ -55,8 +55,8 @@ object MainTests extends TestSuite{ val target = test() } } - 'pos1 - check(outer, "cross[jarA].target", Right(outer.cross(List("jarA")).target)) - 'pos2 - check(outer, "cross[jarB].target", Right(outer.cross(List("jarB")).target)) + 'pos1 - check(outer, "cross[jarA].target", Right(outer.cross("jarA").target)) + 'pos2 - check(outer, "cross[jarB].target", Right(outer.cross("jarB").target)) 'neg1 - check(outer, "cross[jarA].doesntExist", Left("Cannot resolve task cross[jarA].doesntExist")) // 'neg2 - check(outer, "cross[doesntExist].doesntExist", Left("Cannot resolve cross cross[doesntExist]")) // 'neg2 - check(outer, "cross[doesntExist].target", Left("Cannot resolve cross cross[doesntExist]")) @@ -74,12 +74,12 @@ object MainTests extends TestSuite{ 'pos1 - check( outer, "cross[jvm,jarA].target", - Right(outer.cross(List("jvm", "jarA")).target) + Right(outer.cross("jvm", "jarA").target) ) 'pos2 - check( outer, "cross[jvm,jarB].target", - Right(outer.cross(List("jvm", "jarB")).target) + Right(outer.cross("jvm", "jarB").target) ) } 'nested - { |