diff options
| author | Alexandra Dima <alexandra.dima@jetbrains.com> | 2019-07-18 14:42:11 +0200 |
|---|---|---|
| committer | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-12 14:33:06 +0200 |
| commit | 2d03a6ca1706c9c34e4d29414e57031bf084ef21 (patch) | |
| tree | 52ad6a2789e82e41281415446c8dc250d757d8ac | |
| parent | c6585259350412a5ecc1015755ad1f1108a03784 (diff) | |
| download | mill-2d03a6ca1706c9c34e4d29414e57031bf084ef21.tar.gz mill-2d03a6ca1706c9c34e4d29414e57031bf084ef21.tar.bz2 mill-2d03a6ca1706c9c34e4d29414e57031bf084ef21.zip | |
Fixed bug in computing the compilation output directory for the buildtTargetScalacOptions method.
| -rw-r--r-- | contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala | 5 |
1 files 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() |