Skip to content

Commit 8d3e98d

Browse files
committed
REMOVE ME: Check what breaks if we use the CC tasty library
1 parent 6740eaf commit 8d3e98d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dist/bin/common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ find_lib () {
150150
DOTTY_COMP=$(find_lib "*scala3-compiler*")
151151
DOTTY_INTF=$(find_lib "*scala3-interfaces*")
152152
DOTTY_LIB=$(find_lib "*scala3-library*")
153-
SCALA2_LIB_TASTY=$(find_lib "*scala2-library-tasty*")
153+
SCALA2_LIB_TASTY=$(find_lib "*scala2-library-cc-tasty*")
154154
DOTTY_STAGING=$(find_lib "*scala3-staging*")
155155
DOTTY_TASTY_INSPECTOR=$(find_lib "*scala3-tasty-inspector*")
156156
TASTY_CORE=$(find_lib "*tasty-core*")

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,7 +2112,7 @@ object Build {
21122112
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
21132113
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
21142114
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scala3-sbt-bridge`, scala3PresentationCompiler).
2115-
bootstrappedAggregate(`scala2-library-tasty`, `scala3-language-server`, `scala3-staging`,
2115+
bootstrappedAggregate(`scala2-library-cc-tasty`, `scala3-language-server`, `scala3-staging`,
21162116
`scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc).
21172117
dependsOn(tastyCore).
21182118
dependsOn(dottyCompiler).
@@ -2204,7 +2204,7 @@ object Build {
22042204
def asDist(implicit mode: Mode): Project = project.
22052205
enablePlugins(PackPlugin).
22062206
withCommonSettings.
2207-
dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, `scala2-library-tasty`, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc).
2207+
dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, `scala2-library-cc-tasty`, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc).
22082208
settings(commonDistSettings).
22092209
bootstrappedSettings(
22102210
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings

0 commit comments

Comments
 (0)