diff --git a/build.sc b/build.sc index 1f000c9caad..c7935231fc1 100644 --- a/build.sc +++ b/build.sc @@ -441,15 +441,15 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima { ), // See https://github.com/com-lihaoyi/mill/pull/3072 ProblemFilter.exclude[ReversedMissingMethodProblem]( - "mill.scalalib.ScalaModule.mill$scalalib$ScalaModule$$super$auxiliaryClassFileExtensions" + "mill.scalalib.ScalaModule.mill$scalalib$ScalaModule$$super$zincAuxiliaryClassFileExtensions" ), // See https://github.com/com-lihaoyi/mill/pull/3072 ProblemFilter.exclude[ReversedMissingMethodProblem]( - "mill.scalajslib.ScalaJSModule.mill$scalajslib$ScalaJSModule$$super$auxiliaryClassFileExtensions" + "mill.scalajslib.ScalaJSModule.mill$scalajslib$ScalaJSModule$$super$zincAuxiliaryClassFileExtensions" ), // See https://github.com/com-lihaoyi/mill/pull/3072 ProblemFilter.exclude[ReversedMissingMethodProblem]( - "mill.scalanativelib.ScalaNativeModule.mill$scalanativelib$ScalaNativeModule$$super$auxiliaryClassFileExtensions" + "mill.scalanativelib.ScalaNativeModule.mill$scalanativelib$ScalaNativeModule$$super$zincAuxiliaryClassFileExtensions" ) ) def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index c572eefdd1a..cd6ac0baaba 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -295,8 +295,8 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => )) } - override def auxiliaryClassFileExtensions: T[Seq[String]] = - super.auxiliaryClassFileExtensions() :+ "sjsir" + override def zincAuxiliaryClassFileExtensions: T[Seq[String]] = + super.zincAuxiliaryClassFileExtensions() :+ "sjsir" } diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index 6d08a306acf..132e9e31f6a 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -1009,7 +1009,7 @@ trait JavaModule /** * Files extensions that need to be managed by Zinc together with class files */ - def auxiliaryClassFileExtensions: T[Seq[String]] = T { Seq.empty[String] } + def zincAuxiliaryClassFileExtensions: T[Seq[String]] = T { Seq.empty[String] } /** * @param all If `true` fetches also source dependencies diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index b26ec5e7478..c8c884238f1 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -299,7 +299,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer => reporter = T.reporter.apply(hashCode), reportCachedProblems = zincReportCachedProblems(), incrementalCompilation = zincIncrementalCompilation(), - auxiliaryClassFileExtensions = auxiliaryClassFileExtensions() + auxiliaryClassFileExtensions = zincAuxiliaryClassFileExtensions() ) } @@ -549,8 +549,8 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer => else ZincWorkerUtil.scalaBinaryVersion(scalaVersion()) } - override def auxiliaryClassFileExtensions: T[Seq[String]] = T { - super.auxiliaryClassFileExtensions() ++ ( + override def zincAuxiliaryClassFileExtensions: T[Seq[String]] = T { + super.zincAuxiliaryClassFileExtensions() ++ ( if (ZincWorkerUtil.isScala3(scalaVersion())) Seq("tasty") else Seq.empty[String] ) @@ -674,7 +674,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer => reporter = None, reportCachedProblems = zincReportCachedProblems(), incrementalCompilation = zincIncrementalCompilation(), - auxiliaryClassFileExtensions = auxiliaryClassFileExtensions() + auxiliaryClassFileExtensions = zincAuxiliaryClassFileExtensions() ) .map(r => SemanticDbJavaModule.copySemanticdbFiles(r.classes.path, T.workspace, T.dest / "data") diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala index 0e62d883f7c..d934ada850c 100644 --- a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala +++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala @@ -335,8 +335,8 @@ trait ScalaNativeModule extends ScalaModule { outer => } } - override def auxiliaryClassFileExtensions: T[Seq[String]] = - super.auxiliaryClassFileExtensions() :+ "nir" + override def zincAuxiliaryClassFileExtensions: T[Seq[String]] = + super.zincAuxiliaryClassFileExtensions() :+ "nir" }