@@ -336,18 +336,6 @@ object Build {
336
336
javaOptions += " -DBENCH_CLASS_PATH=" + Attributed .data((fullClasspath in (`scala3-library-bootstrapped`, Compile )).value).mkString(" " , File .pathSeparator, " " )
337
337
)
338
338
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
-
351
339
/** Projects -------------------------------------------------------------- */
352
340
353
341
val dottyCompilerBootstrappedRef = LocalProject (" scala3-compiler-bootstrapped" )
@@ -1100,33 +1088,6 @@ object Build {
1100
1088
lazy val `scala3-tastydoc` = project.in(file(" tastydoc" )).asDottyTastydoc(Bootstrapped )
1101
1089
lazy val `scala3-tastydoc-input` = project.in(file(" tastydoc/input" )).asDottyTastydocInput(Bootstrapped )
1102
1090
1103
- // Depend on scala3-library so that sbt projects using dotty automatically
1104
- // depend on the scala3-library
1105
- lazy val `scala-library` = project.
1106
- dependsOn(`scala3-library-bootstrapped`).
1107
- settings(commonDummySettings).
1108
- settings(
1109
- // Need a direct dependency on the real scala-library even though we indirectly
1110
- // depend on it via scala3-library, because sbt may rewrite dependencies
1111
- // (see https://github.com/sbt/sbt/pull/2634), but won't rewrite the direct
1112
- // dependencies of scala-library (see https://github.com/sbt/sbt/pull/2897)
1113
- libraryDependencies += " org.scala-lang" % " scala-library" % stdlibVersion(Bootstrapped )
1114
- )
1115
-
1116
- lazy val `scala-compiler` = project.
1117
- settings(commonDummySettings)
1118
- lazy val `scala-reflect` = project.
1119
- settings(commonDummySettings).
1120
- settings(
1121
- libraryDependencies := Seq (" org.scala-lang" % " scala-reflect" % stdlibVersion(Bootstrapped ))
1122
- )
1123
- lazy val scalap = project.
1124
- settings(commonDummySettings).
1125
- settings(
1126
- libraryDependencies := Seq (" org.scala-lang" % " scalap" % stdlibVersion(Bootstrapped ))
1127
- )
1128
-
1129
-
1130
1091
// sbt plugin to use Dotty in your own build, see
1131
1092
// https://github.com/lampepfl/scala3-example-project for usage.
1132
1093
lazy val `sbt-dotty` = project.in(file(" sbt-dotty" )).
@@ -1164,8 +1125,6 @@ object Build {
1164
1125
publishLocal in `tasty-core-bootstrapped`,
1165
1126
publishLocal in `scala3-staging`,
1166
1127
publishLocal in `scala3-tasty-inspector`,
1167
- publishLocal in `scala-library`,
1168
- publishLocal in `scala-reflect`,
1169
1128
publishLocal in `scala3-doc-bootstrapped`,
1170
1129
publishLocal in `scala3-bootstrapped` // Needed because sbt currently hardcodes the dotty artifact
1171
1130
).evaluated
@@ -1233,8 +1192,6 @@ object Build {
1233
1192
prepareCommunityBuild := {
1234
1193
(publishLocal in `scala3-sbt-bridge`).value
1235
1194
(publishLocal in `scala3-interfaces`).value
1236
- (publishLocal in `scala-library`).value
1237
- (publishLocal in `scala-reflect`).value
1238
1195
(publishLocal in `tasty-core-bootstrapped`).value
1239
1196
(publishLocal in `scala3-library-bootstrapped`).value
1240
1197
(publishLocal in `scala3-doc-bootstrapped`).value
@@ -1366,8 +1323,7 @@ object Build {
1366
1323
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
1367
1324
def asDottyRoot (implicit mode : Mode ): Project = project.withCommonSettings.
1368
1325
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, dottyDoc, `scala3-sbt-bridge`).
1369
- bootstrappedAggregate(`scala-library`, `scala-compiler`, `scala-reflect`, scalap,
1370
- `scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`, `scala3-tastydoc`,
1326
+ bootstrappedAggregate(`scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`, `scala3-tastydoc`,
1371
1327
`scala3-library-bootstrappedJS`).
1372
1328
dependsOn(tastyCore).
1373
1329
dependsOn(dottyCompiler).
@@ -1382,6 +1338,9 @@ object Build {
1382
1338
// non-bootstrapped compiler), so publish the bootstrapped one by
1383
1339
// default.
1384
1340
addCommandAlias(" publishLocal" , " scala3-bootstrapped/publishLocal" ),
1341
+ ).
1342
+ settings(
1343
+ publish / skip := true
1385
1344
)
1386
1345
1387
1346
def asDottyCompiler (implicit mode : Mode ): Project = project.withCommonSettings.
0 commit comments