@@ -1009,7 +1009,6 @@ object Build {
10091009 Map (
10101010 " scala3-interfaces" -> (`scala3-interfaces` / Compile / packageBin).value,
10111011 " scala3-compiler" -> (Compile / packageBin).value,
1012- " tasty-core" -> (`tasty-core` / Compile / packageBin).value,
10131012
10141013 // NOTE: Using scala3-library-bootstrapped here is intentional: when
10151014 // running the compiler, we should always have the bootstrapped
@@ -1046,7 +1045,6 @@ object Build {
10461045 packageAll := {
10471046 (`scala3-compiler` / packageAll).value ++ Seq (
10481047 " scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
1049- " tasty-core" -> (LocalProject (" tasty-core-bootstrapped" ) / Compile / packageBin).value.getAbsolutePath,
10501048 )
10511049 },
10521050
@@ -1574,7 +1572,7 @@ object Build {
15741572 val dottyInterfaces = (`scala3-interfaces` / Compile / packageBin).value.getAbsolutePath.toString
15751573 val dottyStaging = (`scala3-staging-new` / Compile / packageBin).value.getAbsolutePath.toString
15761574 val dottyTastyInspector = (`scala3-tasty-inspector-new` / Compile / packageBin).value.getAbsolutePath.toString
1577- val tastyCore = (`tasty-core-bootstrapped` / Compile / packageBin).value.getAbsolutePath.toString
1575+ val tastyCore = (`tasty-core-bootstrapped-new ` / Compile / packageBin).value.getAbsolutePath.toString
15781576 val asm = findArtifactPath(externalDeps, " scala-asm" )
15791577 val compilerInterface = findArtifactPath(externalDeps, " compiler-interface" )
15801578 extraClasspath ++= Seq (dottyCompiler, dottyInterfaces, asm, dottyStaging, dottyTastyInspector, tastyCore, compilerInterface)
@@ -2916,12 +2914,9 @@ object Build {
29162914 scalacOptions += " -source:3.0-migration"
29172915 )
29182916
2919- lazy val `tasty-core` = project.in(file(" tasty" )).asTastyCore(NonBootstrapped )
2920- lazy val `tasty-core-bootstrapped` : Project = project.in(file(" tasty" )).asTastyCore(Bootstrapped )
2921-
29222917 def tastyCore (implicit mode : Mode ): Project = mode match {
2923- case NonBootstrapped => `tasty-core`
2924- case Bootstrapped => `tasty-core-bootstrapped`
2918+ case NonBootstrapped => `tasty-core-nonbootstrapped `
2919+ case Bootstrapped => `tasty-core-bootstrapped-new `
29252920 }
29262921
29272922 lazy val `scala3-presentation-compiler` = project.in(file(" presentation-compiler" ))
@@ -3978,18 +3973,6 @@ object Build {
39783973 } else base
39793974 }
39803975
3981-
3982- def asTastyCore (implicit mode : Mode ): Project = project.withCommonSettings.
3983- dependsOn(dottyLibrary).
3984- settings(tastyCoreSettings).
3985- settings(disableDocSetting).
3986- settings(
3987- versionScheme := Some (" semver-spec" ),
3988- Test / envVars ++= Map (
3989- " EXPECTED_TASTY_VERSION" -> expectedTastyVersion,
3990- ),
3991- )
3992-
39933976 /* def asDottyBench(implicit mode: Mode): Project = project.withCommonSettings.
39943977 dependsOn(dottyCompiler).
39953978 settings(commonBenchmarkSettings).
0 commit comments