Skip to content

Commit

Permalink
Rename auxiliaryClassFileExtensions to `zincAuxiliaryClassFileExten…
Browse files Browse the repository at this point in the history
…sions`
  • Loading branch information
lolgab committed Mar 11, 2024
1 parent 4a3cef8 commit 52e6675
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scalajslib/src/mill/scalajslib/ScalaJSModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"

}

Expand Down
2 changes: 1 addition & 1 deletion scalalib/src/mill/scalalib/JavaModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions scalalib/src/mill/scalalib/ScalaModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
}

Expand Down Expand Up @@ -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]
)
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

}

Expand Down

0 comments on commit 52e6675

Please sign in to comment.