@@ -1548,33 +1548,29 @@ object Build {
1548
1548
managedScalaInstance := true ,
1549
1549
// Configure the nonbootstrapped compiler
1550
1550
scalaInstance := {
1551
- val externalLibraryDeps = (`scala3-library` / Compile / externalDependencyClasspath).value.map(_.data).toSet
1552
- val externalCompilerDeps = (`scala3-compiler` / Compile / externalDependencyClasspath).value.map(_.data).toSet
1551
+ val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
1553
1552
1554
1553
// IMPORTANT: We need to use actual jars to form the ScalaInstance and not
1555
1554
// just directories containing classfiles because sbt maintains a cache of
1556
1555
// compiler instances. This cache is invalidated based on timestamps
1557
1556
// however this is only implemented on jars, directories are never
1558
1557
// invalidated.
1559
- val tastyCore = (`tasty-core` / Compile / packageBin).value
1560
- val scala3Library = (`scala3 -library` / Compile / packageBin).value
1558
+ val tastyCore = (`tasty-core-nonbootstrapped ` / Compile / packageBin).value
1559
+ val scalaLibrary = (`scala -library-nonbootstrapped ` / Compile / packageBin).value
1561
1560
val scala3Interfaces = (`scala3-interfaces` / Compile / packageBin).value
1562
- val scala3Compiler = (`scala3-compiler` / Compile / packageBin).value
1563
-
1564
- val libraryJars = Array (scala3Library) ++ externalLibraryDeps
1565
- val compilerJars = Seq (tastyCore, scala3Interfaces, scala3Compiler) ++ (externalCompilerDeps -- externalLibraryDeps)
1561
+ val scala3Compiler = (`scala3-compiler-nonbootstrapped` / Compile / packageBin).value
1566
1562
1567
1563
Defaults .makeScalaInstance(
1568
1564
dottyNonBootstrappedVersion,
1569
- libraryJars = libraryJars ,
1570
- allCompilerJars = compilerJars ,
1571
- allDocJars = Seq .empty,
1565
+ libraryJars = Array (scalaLibrary) ,
1566
+ allCompilerJars = Seq (tastyCore, scala3Interfaces, scala3Compiler) ++ externalCompilerDeps ,
1567
+ allDocJars = Seq .empty,
1572
1568
state.value,
1573
1569
scalaInstanceTopLoader.value
1574
1570
)
1575
1571
},
1576
1572
scalaCompilerBridgeBinaryJar := {
1577
- Some ((`scala3-sbt-bridge` / Compile / packageBin).value)
1573
+ Some ((`scala3-sbt-bridge-nonbootstrapped ` / Compile / packageBin).value)
1578
1574
},
1579
1575
)
1580
1576
0 commit comments