Skip to content
Merged
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
8 changes: 2 additions & 6 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ object Build {
moduleName := "scala3-sbt-bridge",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
scalaVersion := dottyNonBootstrappedVersion,
Copy link
Member Author

Choose a reason for hiding this comment

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

The scalaVersion set for bootstrapped project should be dottyNonBootstrappedVersion

crossPaths := false, // org.scala-lang:scala3-sbt-bridge doesn't have a crosspath
autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-nonbootstrapped`
// Add the source directories for the sbt-bridge (boostrapped)
Expand All @@ -1495,11 +1495,6 @@ object Build {
("org.scala-sbt" %% "zinc-apiinfo" % "1.8.0" % Test).cross(CrossVersion.for3Use2_13),
"com.github.sbt" % "junit-interface" % "0.13.3" % Test,
),
// Exclude the transitive dependencies from `zinc-apiinfo` that causes issues at the moment
excludeDependencies ++= Seq(
"org.scala-lang" % "scala-reflect",
"org.scala-lang" % "scala-compiler",
),
// Packaging configuration of `scala3-sbt-bridge`
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := false,
Expand All @@ -1511,6 +1506,7 @@ object Build {
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala3-sbt-bridge-bootstrapped",
// Configure to use the non-bootstrapped compiler
managedScalaInstance := false,
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet

Expand Down
Loading