@@ -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" )
@@ -1124,39 +1112,6 @@ object Build {
1124
1112
lazy val `scala3-tastydoc` = project.in(file(" tastydoc" )).asDottyTastydoc(Bootstrapped )
1125
1113
lazy val `scala3-tastydoc-input` = project.in(file(" tastydoc/input" )).asDottyTastydocInput(Bootstrapped )
1126
1114
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
-
1160
1115
// sbt plugin to use Dotty in your own build, see
1161
1116
// https://github.com/lampepfl/scala3-example-project for usage.
1162
1117
lazy val `sbt-dotty` = project.in(file(" sbt-dotty" )).
@@ -1194,8 +1149,6 @@ object Build {
1194
1149
publishLocal in `tasty-core-bootstrapped`,
1195
1150
publishLocal in `scala3-staging`,
1196
1151
publishLocal in `scala3-tasty-inspector`,
1197
- publishLocal in `scala-library`,
1198
- publishLocal in `scala-reflect`,
1199
1152
publishLocal in `scala3-doc-bootstrapped`,
1200
1153
publishLocal in `scala3-bootstrapped` // Needed because sbt currently hardcodes the dotty artifact
1201
1154
).evaluated
@@ -1263,8 +1216,6 @@ object Build {
1263
1216
prepareCommunityBuild := {
1264
1217
(publishLocal in `scala3-sbt-bridge`).value
1265
1218
(publishLocal in `scala3-interfaces`).value
1266
- (publishLocal in `scala-library`).value
1267
- (publishLocal in `scala-reflect`).value
1268
1219
(publishLocal in `tasty-core-bootstrapped`).value
1269
1220
(publishLocal in `scala3-library-bootstrapped`).value
1270
1221
(publishLocal in `scala3-doc-bootstrapped`).value
@@ -1396,8 +1347,7 @@ object Build {
1396
1347
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
1397
1348
def asDottyRoot (implicit mode : Mode ): Project = project.withCommonSettings.
1398
1349
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`,
1401
1351
`scala3-library-bootstrappedJS`).
1402
1352
dependsOn(tastyCore).
1403
1353
dependsOn(dottyCompiler).
0 commit comments