Skip to content

Commit 25092c7

Browse files
authored
chore: drop outdated dependency exclusion (#23807)
For bootstrapped projects, we can already remove the workaround coursier setting the same version for some artifacts. sbt 1.11.5 will not enforce the same versions when `scalaVersion` is >=3.8.0. Migration to sbt 1.11.5 was done in #23805
2 parents ee2f641 + 8d34a4a commit 25092c7

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

project/Build.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ object Build {
14781478
moduleName := "scala3-sbt-bridge",
14791479
version := dottyVersion,
14801480
versionScheme := Some("semver-spec"),
1481-
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
1481+
scalaVersion := dottyNonBootstrappedVersion,
14821482
crossPaths := false, // org.scala-lang:scala3-sbt-bridge doesn't have a crosspath
14831483
autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-nonbootstrapped`
14841484
// Add the source directories for the sbt-bridge (boostrapped)
@@ -1495,11 +1495,6 @@ object Build {
14951495
("org.scala-sbt" %% "zinc-apiinfo" % "1.8.0" % Test).cross(CrossVersion.for3Use2_13),
14961496
"com.github.sbt" % "junit-interface" % "0.13.3" % Test,
14971497
),
1498-
// Exclude the transitive dependencies from `zinc-apiinfo` that causes issues at the moment
1499-
excludeDependencies ++= Seq(
1500-
"org.scala-lang" % "scala-reflect",
1501-
"org.scala-lang" % "scala-compiler",
1502-
),
15031498
// Packaging configuration of `scala3-sbt-bridge`
15041499
Compile / packageBin / publishArtifact := true,
15051500
Compile / packageDoc / publishArtifact := false,
@@ -1511,6 +1506,7 @@ object Build {
15111506
// Project specific target folder. sbt doesn't like having two projects using the same target folder
15121507
target := target.value / "scala3-sbt-bridge-bootstrapped",
15131508
// Configure to use the non-bootstrapped compiler
1509+
managedScalaInstance := false,
15141510
scalaInstance := {
15151511
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
15161512

0 commit comments

Comments
 (0)