summaryrefslogtreecommitdiff
path: root/scalalib/src/JavaModule.scala
diff options
context:
space:
mode:
authorAlexandra Dima <alexandra.dima@jetbrains.com>2019-07-12 12:31:35 +0200
committerSamvel Abrahamyan <samvel1024@gmail.com>2019-10-12 14:33:01 +0200
commit9c39dd6776944b15433f44c5c4fba994cdd7d152 (patch)
tree92b84f1ae0597812d49a04f317d96dcf0baff5c9 /scalalib/src/JavaModule.scala
parentcf2ddf2f9da40007847ca69dc521098727b98f6d (diff)
downloadmill-9c39dd6776944b15433f44c5c4fba994cdd7d152.tar.gz
mill-9c39dd6776944b15433f44c5c4fba994cdd7d152.tar.bz2
mill-9c39dd6776944b15433f44c5c4fba994cdd7d152.zip
Added support for merging compile parameters from the mill build file with the compile parameters specified through bsp
Diffstat (limited to 'scalalib/src/JavaModule.scala')
-rw-r--r--scalalib/src/JavaModule.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/scalalib/src/JavaModule.scala b/scalalib/src/JavaModule.scala
index e6c47324..941f82e7 100644
--- a/scalalib/src/JavaModule.scala
+++ b/scalalib/src/JavaModule.scala
@@ -221,7 +221,7 @@ trait JavaModule extends mill.Module with TaskModule with GenIdeaModule { outer
upstreamCompileOutput(),
allSourceFiles().map(_.path),
compileClasspath().map(_.path),
- javacOptions(),
+ javacOptions() ++ T.ctx.compileArguments,
T.ctx().reporter
)
}