From fd86405ad903a1c3ddb00a8331d7acb1b89810ec Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 10 Sep 2024 08:16:45 +0200 Subject: [PATCH 1/2] Refine compile options management Don't propagate `mandatoryScalacOptions` and `scalacPluginclasspath` from the `ScalaModule` to `ScalaTests`. --- scalalib/src/mill/scalalib/ScalaModule.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index ac78703feb1..ba40c92a9fe 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -32,9 +32,9 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer => override def scalaOrganization: Target[String] = outer.scalaOrganization() override def scalaVersion: Target[String] = outer.scalaVersion() override def scalacPluginIvyDeps: Target[Agg[Dep]] = outer.scalacPluginIvyDeps() - override def scalacPluginClasspath: Target[Agg[PathRef]] = outer.scalacPluginClasspath() +// override def scalacPluginClasspath: Target[Agg[PathRef]] = outer.scalacPluginClasspath() override def scalacOptions: Target[Seq[String]] = outer.scalacOptions() - override def mandatoryScalacOptions: Target[Seq[String]] = outer.mandatoryScalacOptions() +// override def mandatoryScalacOptions: Target[Seq[String]] = outer.mandatoryScalacOptions() } /** From ea656555c54a82266cbec07753563229cdc4098a Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 10 Sep 2024 08:26:39 +0200 Subject: [PATCH 2/2] . --- scalalib/src/mill/scalalib/ScalaModule.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index ba40c92a9fe..bc60f483892 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -32,9 +32,9 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer => override def scalaOrganization: Target[String] = outer.scalaOrganization() override def scalaVersion: Target[String] = outer.scalaVersion() override def scalacPluginIvyDeps: Target[Agg[Dep]] = outer.scalacPluginIvyDeps() -// override def scalacPluginClasspath: Target[Agg[PathRef]] = outer.scalacPluginClasspath() + override def scalacPluginClasspath: Target[Agg[PathRef]] = T { super.scalacPluginClasspath() } override def scalacOptions: Target[Seq[String]] = outer.scalacOptions() -// override def mandatoryScalacOptions: Target[Seq[String]] = outer.mandatoryScalacOptions() + override def mandatoryScalacOptions: Target[Seq[String]] = T { super.mandatoryScalacOptions() } } /**