Merge pull request #5919 from eed3si9n/wip/epoch

Epoch directory src/main/{scala-2, scala-3}
This commit is contained in:
eugene yokota 2020-10-03 23:54:01 -04:00 committed by GitHub
commit 6b5f2ab3f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 0 deletions

View File

@ -541,10 +541,13 @@ object Defaults extends BuildCommon {
scalaSource := sourceDirectory.value / "scala",
javaSource := sourceDirectory.value / "java",
unmanagedSourceDirectories := {
val isDotty = ScalaInstance.isDotty(scalaVersion.value)
val epochVersion = if (isDotty) "3" else "2"
makeCrossSources(
scalaSource.value,
javaSource.value,
scalaBinaryVersion.value,
epochVersion,
crossPaths.value
) ++
makePluginCrossSources(
@ -671,6 +674,24 @@ object Defaults extends BuildCommon {
)
)
def makeCrossSources(
scalaSrcDir: File,
javaSrcDir: File,
sv: String,
epochVersion: String,
cross: Boolean
): Seq[File] = {
if (cross)
Seq(
scalaSrcDir,
scalaSrcDir.getParentFile / s"${scalaSrcDir.name}-$sv",
scalaSrcDir.getParentFile / s"${scalaSrcDir.name}-$epochVersion",
javaSrcDir,
)
else
Seq(scalaSrcDir, javaSrcDir)
}
def makeCrossSources(
scalaSrcDir: File,
javaSrcDir: File,