Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,15 @@ lazy val aggregated: Seq[ProjectReference] = compilerInterface.projectRefs ++
zincCore.projectRefs ++
zincPersist.projectRefs ++
zincTesting.projectRefs ++
zinc.projectRefs
compilerBridgeTest.projectRefs ++
zinc.projectRefs ++ Seq[ProjectReference](
classesDep1,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to aggregate this, jar1, or jar2?

compilerBridgeScala213Bin,
compilerBridgeScala3Bin,
jar1,
jar2,
zincScripted3
)

lazy val zincRoot: Project = (project in file("."))
.aggregate(aggregated: _*)
Expand Down Expand Up @@ -230,9 +238,12 @@ lazy val zinc = (projectMatrix in (zincRootPath / "zinc"))
def resGenFile = (zincRootPath / "zinc" / "resGenerator").getAbsoluteFile

lazy val jar1 = (project in resGenFile / "jar1").settings(sampleProjectSettings("jar"))
.disablePlugins(HeaderPlugin)
lazy val jar2 = (project in resGenFile / "jar2").settings(sampleProjectSettings("jar"))
.disablePlugins(HeaderPlugin)
lazy val classesDep1 =
(project in resGenFile / "classesDep1").settings(sampleProjectSettings("zip"))
.disablePlugins(HeaderPlugin)

lazy val zinc3 = zinc.jvm(scala3)

Expand Down Expand Up @@ -483,6 +494,7 @@ lazy val compilerBridgeScala3Bin = (project in internalPath / "compilerBridgeSca
* (Zinc API Info, which transitively depends on IO).
*/
lazy val compilerBridgeTest = (projectMatrix in internalPath / "compiler-bridge-test")
.disablePlugins(HeaderPlugin)
.dependsOn(
zinc3 % "compile->compile;test->test",
compilerInterface.jvm(false)
Expand Down Expand Up @@ -611,6 +623,7 @@ lazy val zincClassfile = (projectMatrix in internalPath / "zinc-classfile")
lazy val zincScripted = (projectMatrix in internalPath / "zinc-scripted")
.dependsOn(zinc % "compile;test->test")
.enablePlugins(BuildInfoPlugin)
.disablePlugins(HeaderPlugin)
.settings(
baseSettings,
publish / skip := true,
Expand Down
1 change: 1 addition & 0 deletions project/ZincBuildUtil.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ object ZincBuildUtil {

def sampleProjectSettings(ext: String) =
Seq(
publish / skip := true,
(Compile / scalaSource) := baseDirectory.value / "src",
genTestResTask := {
def resurcesDir = (file("zinc") / "src" / "test" / "resources" / "bin").getAbsoluteFile
Expand Down