From 23cef1eccce3030166a6731823fc78d67b345261 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Fri, 29 Dec 2017 01:59:51 -0800
Subject: Kill old `LabelledTarget` classes

---
 scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala         | 4 ++--
 scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala | 2 +-
 scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scalaplugin/src')

diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
index c7ea448a..ee2ddf60 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
@@ -2,7 +2,7 @@ package mill.scalaplugin
 
 import ammonite.ops._
 import mill.define.Target
-import mill.discover.Mirror.{LabelledTarget, Segment}
+import mill.discover.Mirror.Segment
 import mill.discover.{Discovered, Mirror}
 import mill.eval.{Evaluator, PathRef}
 import mill.util.Ctx.LoaderCtx
@@ -80,7 +80,7 @@ object GenIdea {
 
       val (destPath, jsonPath) = Evaluator.resolveDestPaths(
         evaluator.workspacePath,
-        evaluator.mapping.value(mod.compile)
+        evaluator.mapping.modules(mod.compile)
       )
 
       val elem = moduleXmlTemplate(
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala
index 4ec10472..166fb5c0 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala
@@ -166,7 +166,7 @@ object HelloWorldTests extends TestSuite {
 
         val (compilePath, compileMetadataPath) = Evaluator.resolveDestPaths(
           workspacePath,
-          helloWorldEvaluator.evaluator.mapping.value(HelloWorld.compile)
+          helloWorldEvaluator.evaluator.mapping.targets(HelloWorld.compile)
         )
 
         assert(
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala b/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala
index 05d53e8d..f1cee213 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala
@@ -17,7 +17,7 @@ class TestEvaluator(mapping: Discovered.Mapping[_], workspacePath: Path){
         Tuple2(
           evaluated.rawValues.head.asInstanceOf[Result.Success[T]].value,
           evaluated.evaluated.collect {
-            case t: Target[_] if mapping.value.contains(t) => t
+            case t: Target[_] if mapping.targets.contains(t) => t
             case t: mill.define.Command[_]           => t
           }.size
         ))
-- 
cgit v1.2.3