Skip to content

Commit f395ca9

Browse files
Delete dummy projects
1 parent 28ec961 commit f395ca9

File tree

2 files changed

+1
-55
lines changed

2 files changed

+1
-55
lines changed

build.sbt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ val `tasty-core-scala2` = Build.`tasty-core-scala2`
2121
val `scala3-tastydoc` = Build.`scala3-tastydoc`
2222
val `scala3-tastydoc-input` = Build.`scala3-tastydoc-input`
2323
val `scala3-bench-run` = Build.`scala3-bench-run`
24-
val `scala-library` = Build.`scala-library`
25-
val `scala-compiler` = Build.`scala-compiler`
26-
val `scala-reflect` = Build.`scala-reflect`
27-
val scalap = Build.scalap
2824
val dist = Build.dist
2925
val `community-build` = Build.`community-build`
3026

project/Build.scala

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -336,18 +336,6 @@ object Build {
336336
javaOptions += "-DBENCH_CLASS_PATH=" + Attributed.data((fullClasspath in (`scala3-library-bootstrapped`, Compile)).value).mkString("", File.pathSeparator, "")
337337
)
338338

339-
// sbt >= 0.13.12 will automatically rewrite transitive dependencies on
340-
// any version in any organization of scala{-library,-compiler,-reflect,p}
341-
// to have organization `scalaOrganization` and version `scalaVersion`
342-
// (see https://github.com/sbt/sbt/pull/2634).
343-
// This means that we need to provide dummy artefacts for these projects,
344-
// otherwise users will get compilation errors if they happen to transitively
345-
// depend on one of these projects.
346-
lazy val commonDummySettings = commonBootstrappedSettings ++ Seq(
347-
crossPaths := false,
348-
libraryDependencies := Seq()
349-
)
350-
351339
/** Projects -------------------------------------------------------------- */
352340

353341
val dottyCompilerBootstrappedRef = LocalProject("scala3-compiler-bootstrapped")
@@ -1124,39 +1112,6 @@ object Build {
11241112
lazy val `scala3-tastydoc` = project.in(file("tastydoc")).asDottyTastydoc(Bootstrapped)
11251113
lazy val `scala3-tastydoc-input` = project.in(file("tastydoc/input")).asDottyTastydocInput(Bootstrapped)
11261114

1127-
// Depend on scala3-library so that sbt projects using dotty automatically
1128-
// depend on the scala3-library
1129-
lazy val `scala-library` = project.
1130-
dependsOn(`scala3-library-bootstrapped`).
1131-
settings(commonDummySettings).
1132-
settings(
1133-
// Need a direct dependency on the real scala-library even though we indirectly
1134-
// depend on it via scala3-library, because sbt may rewrite dependencies
1135-
// (see https://github.com/sbt/sbt/pull/2634), but won't rewrite the direct
1136-
// dependencies of scala-library (see https://github.com/sbt/sbt/pull/2897)
1137-
libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped),
1138-
publish / skip := true
1139-
)
1140-
1141-
lazy val `scala-compiler` = project.
1142-
settings(commonDummySettings).
1143-
settings(
1144-
publish / skip := true
1145-
)
1146-
lazy val `scala-reflect` = project.
1147-
settings(commonDummySettings).
1148-
settings(
1149-
libraryDependencies := Seq("org.scala-lang" % "scala-reflect" % stdlibVersion(Bootstrapped)),
1150-
publish / skip := true
1151-
)
1152-
lazy val scalap = project.
1153-
settings(commonDummySettings).
1154-
settings(
1155-
libraryDependencies := Seq("org.scala-lang" % "scalap" % stdlibVersion(Bootstrapped)),
1156-
publish / skip := true
1157-
)
1158-
1159-
11601115
// sbt plugin to use Dotty in your own build, see
11611116
// https://github.com/lampepfl/scala3-example-project for usage.
11621117
lazy val `sbt-dotty` = project.in(file("sbt-dotty")).
@@ -1194,8 +1149,6 @@ object Build {
11941149
publishLocal in `tasty-core-bootstrapped`,
11951150
publishLocal in `scala3-staging`,
11961151
publishLocal in `scala3-tasty-inspector`,
1197-
publishLocal in `scala-library`,
1198-
publishLocal in `scala-reflect`,
11991152
publishLocal in `scala3-doc-bootstrapped`,
12001153
publishLocal in `scala3-bootstrapped` // Needed because sbt currently hardcodes the dotty artifact
12011154
).evaluated
@@ -1263,8 +1216,6 @@ object Build {
12631216
prepareCommunityBuild := {
12641217
(publishLocal in `scala3-sbt-bridge`).value
12651218
(publishLocal in `scala3-interfaces`).value
1266-
(publishLocal in `scala-library`).value
1267-
(publishLocal in `scala-reflect`).value
12681219
(publishLocal in `tasty-core-bootstrapped`).value
12691220
(publishLocal in `scala3-library-bootstrapped`).value
12701221
(publishLocal in `scala3-doc-bootstrapped`).value
@@ -1396,8 +1347,7 @@ object Build {
13961347
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
13971348
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
13981349
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, dottyDoc, `scala3-sbt-bridge`).
1399-
bootstrappedAggregate(`scala-library`, `scala-compiler`, `scala-reflect`, scalap,
1400-
`scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`, `scala3-tastydoc`,
1350+
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`, `scala3-tastydoc`,
14011351
`scala3-library-bootstrappedJS`).
14021352
dependsOn(tastyCore).
14031353
dependsOn(dottyCompiler).

0 commit comments

Comments
 (0)