From 2d03a6ca1706c9c34e4d29414e57031bf084ef21 Mon Sep 17 00:00:00 2001 From: Alexandra Dima Date: Thu, 18 Jul 2019 14:42:11 +0200 Subject: Fixed bug in computing the compilation output directory for the buildtTargetScalacOptions method. --- contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala index b191aed9..c3273e49 100644 --- a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala +++ b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala @@ -427,9 +427,8 @@ class MillBuildServer(evaluator: Evaluator, val options = evaluateInformativeTask(evaluator, m.scalacOptions, Seq.empty[String]).toList val classpath = evaluateInformativeTask(evaluator, m.compileClasspath, Agg.empty[PathRef]). map(pathRef => pathRef.path.toNIO.toAbsolutePath.toUri.toString).toList - val index = m.millModuleSegments.parts.length - - val classDirectory = Evaluator.resolveDestPaths(os.pwd / "out", m.millModuleSegments).out.toIO.toURI.toString//m.millSourcePath.toNIO.toAbsolutePath.toUri.toString + val classDirectory = (Evaluator.resolveDestPaths(os.pwd / "out" , m.millModuleSegments). + dest / "classes").toIO.toURI.toString targetScalacOptions ++= List(new ScalacOptionsItem(targetId, options.asJava, classpath.asJava, classDirectory)) case m: JavaModule => targetScalacOptions ++= List() -- cgit v1.2.3