Skip to content

Commit 5fbab5d

Browse files
committed
remove old tasty-core
1 parent fb22fe4 commit 5fbab5d

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ val `scala3-language-server` = Build.`scala3-language-server`
2626
//val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
2727
//val `scala3-bench-micro` = Build.`scala3-bench-micro`
2828
//val `scala3-bench-run` = Build.`scala3-bench-run`
29-
val `tasty-core` = Build.`tasty-core`
3029
val `tasty-core-nonbootstrapped` = Build.`tasty-core-nonbootstrapped`
3130
val `tasty-core-bootstrapped-new` = Build.`tasty-core-bootstrapped-new`
32-
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
3331
val scaladoc = Build.scaladoc
3432
val `scaladoc-new` = Build.`scaladoc-new`
3533
val `scaladoc-testcases` = Build.`scaladoc-testcases`

project/Build.scala

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,6 @@ object Build {
977977
Map(
978978
"scala3-interfaces" -> (`scala3-interfaces` / Compile / packageBin).value,
979979
"scala3-compiler" -> (Compile / packageBin).value,
980-
"tasty-core" -> (`tasty-core` / Compile / packageBin).value,
981980

982981
// NOTE: Using scala3-library-bootstrapped here is intentional: when
983982
// running the compiler, we should always have the bootstrapped
@@ -1014,7 +1013,6 @@ object Build {
10141013
packageAll := {
10151014
(`scala3-compiler` / packageAll).value ++ Seq(
10161015
"scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
1017-
"tasty-core" -> (LocalProject("tasty-core-bootstrapped") / Compile / packageBin).value.getAbsolutePath,
10181016
)
10191017
},
10201018

@@ -1542,7 +1540,7 @@ object Build {
15421540
val dottyInterfaces = (`scala3-interfaces` / Compile / packageBin).value.getAbsolutePath.toString
15431541
val dottyStaging = (`scala3-staging-new` / Compile / packageBin).value.getAbsolutePath.toString
15441542
val dottyTastyInspector = (`scala3-tasty-inspector-new` / Compile / packageBin).value.getAbsolutePath.toString
1545-
val tastyCore = (`tasty-core-bootstrapped` / Compile / packageBin).value.getAbsolutePath.toString
1543+
val tastyCore = (`tasty-core-bootstrapped-new` / Compile / packageBin).value.getAbsolutePath.toString
15461544
val asm = findArtifactPath(externalDeps, "scala-asm")
15471545
val compilerInterface = findArtifactPath(externalDeps, "compiler-interface")
15481546
extraClasspath ++= Seq(dottyCompiler, dottyInterfaces, asm, dottyStaging, dottyTastyInspector, tastyCore, compilerInterface)
@@ -2856,12 +2854,9 @@ object Build {
28562854
scalacOptions += "-source:3.0-migration"
28572855
)
28582856

2859-
lazy val `tasty-core` = project.in(file("tasty")).asTastyCore(NonBootstrapped)
2860-
lazy val `tasty-core-bootstrapped`: Project = project.in(file("tasty")).asTastyCore(Bootstrapped)
2861-
28622857
def tastyCore(implicit mode: Mode): Project = mode match {
2863-
case NonBootstrapped => `tasty-core`
2864-
case Bootstrapped => `tasty-core-bootstrapped`
2858+
case NonBootstrapped => `tasty-core-nonbootstrapped`
2859+
case Bootstrapped => `tasty-core-bootstrapped-new`
28652860
}
28662861

28672862
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
@@ -3918,18 +3913,6 @@ object Build {
39183913
} else base
39193914
}
39203915

3921-
3922-
def asTastyCore(implicit mode: Mode): Project = project.withCommonSettings.
3923-
dependsOn(dottyLibrary).
3924-
settings(tastyCoreSettings).
3925-
settings(disableDocSetting).
3926-
settings(
3927-
versionScheme := Some("semver-spec"),
3928-
Test / envVars ++= Map(
3929-
"EXPECTED_TASTY_VERSION" -> expectedTastyVersion,
3930-
),
3931-
)
3932-
39333916
/*def asDottyBench(implicit mode: Mode): Project = project.withCommonSettings.
39343917
dependsOn(dottyCompiler).
39353918
settings(commonBenchmarkSettings).

0 commit comments

Comments
 (0)