Skip to content

Commit cae74df

Browse files
committed
aggregate all sub projects
1 parent a430676 commit cae74df

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

build.sbt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,15 @@ lazy val aggregated: Seq[ProjectReference] = compilerInterface.projectRefs ++
130130
zincCore.projectRefs ++
131131
zincPersist.projectRefs ++
132132
zincTesting.projectRefs ++
133-
zinc.projectRefs
133+
compilerBridgeTest.projectRefs ++
134+
zinc.projectRefs ++ Seq[ProjectReference](
135+
classesDep1,
136+
compilerBridgeScala213Bin,
137+
compilerBridgeScala3Bin,
138+
jar1,
139+
jar2,
140+
zincScripted3
141+
)
134142

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

232240
lazy val jar1 = (project in resGenFile / "jar1").settings(sampleProjectSettings("jar"))
241+
.disablePlugins(HeaderPlugin)
233242
lazy val jar2 = (project in resGenFile / "jar2").settings(sampleProjectSettings("jar"))
243+
.disablePlugins(HeaderPlugin)
234244
lazy val classesDep1 =
235245
(project in resGenFile / "classesDep1").settings(sampleProjectSettings("zip"))
246+
.disablePlugins(HeaderPlugin)
236247

237248
lazy val zinc3 = zinc.jvm(scala3)
238249

@@ -483,6 +494,7 @@ lazy val compilerBridgeScala3Bin = (project in internalPath / "compilerBridgeSca
483494
* (Zinc API Info, which transitively depends on IO).
484495
*/
485496
lazy val compilerBridgeTest = (projectMatrix in internalPath / "compiler-bridge-test")
497+
.disablePlugins(HeaderPlugin)
486498
.dependsOn(
487499
zinc3 % "compile->compile;test->test",
488500
compilerInterface.jvm(false)
@@ -611,6 +623,7 @@ lazy val zincClassfile = (projectMatrix in internalPath / "zinc-classfile")
611623
lazy val zincScripted = (projectMatrix in internalPath / "zinc-scripted")
612624
.dependsOn(zinc % "compile;test->test")
613625
.enablePlugins(BuildInfoPlugin)
626+
.disablePlugins(HeaderPlugin)
614627
.settings(
615628
baseSettings,
616629
publish / skip := true,

project/ZincBuildUtil.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ object ZincBuildUtil {
4040

4141
def sampleProjectSettings(ext: String) =
4242
Seq(
43+
publish / skip := true,
4344
(Compile / scalaSource) := baseDirectory.value / "src",
4445
genTestResTask := {
4546
def resurcesDir = (file("zinc") / "src" / "test" / "resources" / "bin").getAbsoluteFile

0 commit comments

Comments
 (0)