Skip to content

Commit fea61fd

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old scala3 library bootstrapped
[Cherry-picked a749656]
1 parent 1ba37b0 commit fea61fd

File tree

2 files changed

+5
-145
lines changed

2 files changed

+5
-145
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ val `scala3-library-nonbootstrapped` = Build.`scala3-library-nonbootstrapped`
1414
val `scala-library-bootstrapped` = Build.`scala-library-bootstrapped`
1515
val `scala3-library-bootstrapped-new` = Build.`scala3-library-bootstrapped-new`
1616
val `scala3-library` = Build.`scala3-library`
17-
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
1817
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
1918
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
2019
val `scala3-staging-new` = Build.`scala3-staging-new`

project/Build.scala

Lines changed: 5 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -635,12 +635,12 @@ object Build {
635635
(`scala3-compiler` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
636636
)
637637

638-
lazy val commonBenchmarkSettings = Seq(
638+
/*lazy val commonBenchmarkSettings = Seq(
639639
Jmh / bspEnabled := false,
640640
Jmh / run / mainClass := Some("dotty.tools.benchmarks.Bench"), // custom main for jmh:run
641641
javaOptions += "-DBENCH_COMPILER_CLASS_PATH=" + Attributed.data((`scala3-bootstrapped` / Compile / fullClasspath).value).mkString("", File.pathSeparator, ""),
642642
javaOptions += "-DBENCH_CLASS_PATH=" + Attributed.data((`scala3-library-bootstrapped` / Compile / fullClasspath).value).mkString("", File.pathSeparator, "")
643-
)
643+
)*/
644644

645645
lazy val commonMiMaSettings = Def.settings(
646646
mimaPreviousArtifacts += {
@@ -1014,7 +1014,7 @@ object Build {
10141014
// running the compiler, we should always have the bootstrapped
10151015
// library on the compiler classpath since the non-bootstrapped one
10161016
// may not be binary-compatible.
1017-
"scala3-library" -> (`scala3-library-bootstrapped` / Compile / packageBin).value
1017+
//"scala3-library" -> (`scala3-library-bootstrapped` / Compile / packageBin).value
10181018
).mapValues(_.getAbsolutePath)
10191019
}
10201020
}.value,
@@ -1220,145 +1220,6 @@ object Build {
12201220
file(s"${baseDirectory.value}/src/scala/runtime/VarArgsBuilder.scala"),
12211221
)
12221222
)
1223-
lazy val `scala3-library-bootstrapped`: Project = project.in(file("library")).asDottyLibrary(Bootstrapped)
1224-
.settings(
1225-
// Note: extracted using `print scala3-library-bootstrapped / Compile / sources`
1226-
// Only keep scala3 files until 3.8.0
1227-
Compile / sources := Seq(
1228-
file(s"${baseDirectory.value}/src/scala/Precise.scala"),
1229-
file(s"${baseDirectory.value}/src/scala/CanEqual.scala"),
1230-
file(s"${baseDirectory.value}/src/scala/Conversion.scala"),
1231-
file(s"${baseDirectory.value}/src/scala/PolyFunction.scala"),
1232-
file(s"${baseDirectory.value}/src/scala/IArray.scala"),
1233-
file(s"${baseDirectory.value}/src/scala/CanThrow.scala"),
1234-
file(s"${baseDirectory.value}/src/scala/Tuple.scala"),
1235-
file(s"${baseDirectory.value}/src/scala/Selectable.scala"),
1236-
file(s"${baseDirectory.value}/src/scala/main.scala"),
1237-
file(s"${baseDirectory.value}/src/scala/NamedTuple.scala"),
1238-
file(s"${baseDirectory.value}/src/scala/util/FromDigits.scala"),
1239-
file(s"${baseDirectory.value}/src/scala/util/CommandLineParser.scala"),
1240-
file(s"${baseDirectory.value}/src/scala/util/TupledFunction.scala"),
1241-
file(s"${baseDirectory.value}/src/scala/util/NotGiven.scala"),
1242-
file(s"${baseDirectory.value}/src/scala/util/boundary.scala"),
1243-
file(s"${baseDirectory.value}/src/scala/caps/package.scala"),
1244-
file(s"${baseDirectory.value}/src/scala/caps/Pure.scala"),
1245-
file(s"${baseDirectory.value}/src/scala/reflect/TypeTest.scala"),
1246-
file(s"${baseDirectory.value}/src/scala/reflect/Selectable.scala"),
1247-
file(s"${baseDirectory.value}/src/scala/reflect/Typeable.scala"),
1248-
file(s"${baseDirectory.value}/src/scala/reflect/Enum.scala"),
1249-
file(s"${baseDirectory.value}/src/scala/runtime/TupleMirror.scala"),
1250-
file(s"${baseDirectory.value}/src/scala/runtime/TypeBox.scala"),
1251-
file(s"${baseDirectory.value}/src/scala/runtime/Arrays.scala"),
1252-
file(s"${baseDirectory.value}/src/scala/runtime/TupledFunctions.scala"),
1253-
file(s"${baseDirectory.value}/src/scala/runtime/FunctionXXL.scala"),
1254-
file(s"${baseDirectory.value}/src/scala/runtime/Scala3RunTime.scala"),
1255-
file(s"${baseDirectory.value}/src/scala/runtime/$$throws.scala"),
1256-
file(s"${baseDirectory.value}/src/scala/runtime/LazyVals.scala"),
1257-
file(s"${baseDirectory.value}/src/scala/runtime/EnumValue.scala"),
1258-
file(s"${baseDirectory.value}/src/scala/runtime/TupleXXL.scala"),
1259-
file(s"${baseDirectory.value}/src/scala/runtime/Tuples.scala"),
1260-
file(s"${baseDirectory.value}/src/scala/runtime/MatchCase.scala"),
1261-
file(s"${baseDirectory.value}/src/scala/annotation/retains.scala"),
1262-
file(s"${baseDirectory.value}/src/scala/annotation/capability.scala"),
1263-
file(s"${baseDirectory.value}/src/scala/annotation/static.scala"),
1264-
file(s"${baseDirectory.value}/src/scala/annotation/transparentTrait.scala"),
1265-
file(s"${baseDirectory.value}/src/scala/annotation/RefiningAnnotation.scala"),
1266-
file(s"${baseDirectory.value}/src/scala/annotation/retainsByName.scala"),
1267-
file(s"${baseDirectory.value}/src/scala/annotation/threadUnsafe.scala"),
1268-
file(s"${baseDirectory.value}/src/scala/annotation/constructorOnly.scala"),
1269-
file(s"${baseDirectory.value}/src/scala/annotation/experimental.scala"),
1270-
file(s"${baseDirectory.value}/src/scala/annotation/MacroAnnotation.scala"),
1271-
file(s"${baseDirectory.value}/src/scala/annotation/alpha.scala"),
1272-
file(s"${baseDirectory.value}/src/scala/annotation/publicInBinary.scala"),
1273-
file(s"${baseDirectory.value}/src/scala/annotation/init.scala"),
1274-
file(s"${baseDirectory.value}/src/scala/annotation/unroll.scala"),
1275-
file(s"${baseDirectory.value}/src/scala/annotation/targetName.scala"),
1276-
file(s"${baseDirectory.value}/src/scala/annotation/stableNull.scala"),
1277-
file(s"${baseDirectory.value}/src/scala/deriving/Mirror.scala"),
1278-
file(s"${baseDirectory.value}/src/scala/compiletime/package.scala"),
1279-
file(s"${baseDirectory.value}/src/scala/quoted/Type.scala"),
1280-
file(s"${baseDirectory.value}/src/scala/quoted/Varargs.scala"),
1281-
file(s"${baseDirectory.value}/src/scala/quoted/Quotes.scala"),
1282-
file(s"${baseDirectory.value}/src/scala/quoted/Expr.scala"),
1283-
file(s"${baseDirectory.value}/src/scala/quoted/ExprMap.scala"),
1284-
file(s"${baseDirectory.value}/src/scala/quoted/FromExpr.scala"),
1285-
file(s"${baseDirectory.value}/src/scala/quoted/Exprs.scala"),
1286-
file(s"${baseDirectory.value}/src/scala/quoted/ToExpr.scala"),
1287-
file(s"${baseDirectory.value}/src/scala/util/control/NonLocalReturns.scala"),
1288-
file(s"${baseDirectory.value}/src/scala/runtime/stdLibPatches/language.scala"),
1289-
file(s"${baseDirectory.value}/src/scala/runtime/stdLibPatches/Predef.scala"),
1290-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure8.java"),
1291-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure10.java"),
1292-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure4.java"),
1293-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure5.java"),
1294-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure11.java"),
1295-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure9.java"),
1296-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure2.java"),
1297-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure20.java"),
1298-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure16.java"),
1299-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure17.java"),
1300-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure3.java"),
1301-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure21.java"),
1302-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure18.java"),
1303-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure22.java"),
1304-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure0.java"),
1305-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure14.java"),
1306-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure15.java"),
1307-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure1.java"),
1308-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure19.java"),
1309-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure12.java"),
1310-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure6.java"),
1311-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure7.java"),
1312-
file(s"${baseDirectory.value}/src/scala/runtime/function/JProcedure13.java"),
1313-
file(s"${baseDirectory.value}/src/scala/runtime/coverage/Invoker.scala"),
1314-
file(s"${baseDirectory.value}/src/scala/annotation/internal/ErasedParam.scala"),
1315-
file(s"${baseDirectory.value}/src/scala/annotation/internal/RuntimeChecked.scala"),
1316-
file(s"${baseDirectory.value}/src/scala/annotation/internal/CaptureChecked.scala"),
1317-
file(s"${baseDirectory.value}/src/scala/annotation/internal/ContextResultCount.scala"),
1318-
file(s"${baseDirectory.value}/src/scala/annotation/internal/TASTYSignature.java"),
1319-
file(s"${baseDirectory.value}/src/scala/annotation/internal/Alias.scala"),
1320-
file(s"${baseDirectory.value}/src/scala/annotation/internal/MappedAlternative.scala"),
1321-
file(s"${baseDirectory.value}/src/scala/annotation/internal/Repeated.scala"),
1322-
file(s"${baseDirectory.value}/src/scala/annotation/internal/WithPureFuns.scala"),
1323-
file(s"${baseDirectory.value}/src/scala/annotation/internal/Child.scala"),
1324-
file(s"${baseDirectory.value}/src/scala/annotation/internal/ProvisionalSuperClass.scala"),
1325-
file(s"${baseDirectory.value}/src/scala/annotation/internal/WitnessNames.scala"),
1326-
file(s"${baseDirectory.value}/src/scala/annotation/internal/AssignedNonLocally.scala"),
1327-
file(s"${baseDirectory.value}/src/scala/annotation/internal/preview.scala"),
1328-
file(s"${baseDirectory.value}/src/scala/annotation/internal/InlineParam.scala"),
1329-
file(s"${baseDirectory.value}/src/scala/annotation/internal/SourceFile.scala"),
1330-
file(s"${baseDirectory.value}/src/scala/annotation/internal/reachCapability.scala"),
1331-
file(s"${baseDirectory.value}/src/scala/annotation/internal/$$into.scala"),
1332-
file(s"${baseDirectory.value}/src/scala/annotation/internal/TASTYLongSignature.java"),
1333-
file(s"${baseDirectory.value}/src/scala/annotation/internal/readOnlyCapability.scala"),
1334-
file(s"${baseDirectory.value}/src/scala/annotation/internal/unshared.scala"),
1335-
file(s"${baseDirectory.value}/src/scala/annotation/internal/AnnotationDefault.scala"),
1336-
file(s"${baseDirectory.value}/src/scala/annotation/internal/sharable.scala"),
1337-
file(s"${baseDirectory.value}/src/scala/annotation/internal/Body.scala"),
1338-
file(s"${baseDirectory.value}/src/scala/annotation/internal/requiresCapability.scala"),
1339-
file(s"${baseDirectory.value}/src/scala/annotation/unchecked/uncheckedCaptures.scala"),
1340-
file(s"${baseDirectory.value}/src/scala/annotation/unchecked/uncheckedCapabilityLeaks.scala"),
1341-
file(s"${baseDirectory.value}/src/scala/compiletime/testing/Error.scala"),
1342-
file(s"${baseDirectory.value}/src/scala/compiletime/testing/ErrorKind.scala"),
1343-
file(s"${baseDirectory.value}/src/scala/compiletime/testing/package.scala"),
1344-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/long.scala"),
1345-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/any.scala"),
1346-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/int.scala"),
1347-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/string.scala"),
1348-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/double.scala"),
1349-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/boolean.scala"),
1350-
file(s"${baseDirectory.value}/src/scala/compiletime/ops/float.scala"),
1351-
file(s"${baseDirectory.value}/src/scala/quoted/runtime/QuoteUnpickler.scala"),
1352-
file(s"${baseDirectory.value}/src/scala/quoted/runtime/QuoteMatching.scala"),
1353-
file(s"${baseDirectory.value}/src/scala/quoted/runtime/Expr.scala"),
1354-
file(s"${baseDirectory.value}/src/scala/quoted/runtime/Patterns.scala"),
1355-
file(s"${baseDirectory.value}/src/scala/quoted/runtime/SplicedType.scala"),
1356-
file(s"${baseDirectory.value}/src/scala/quoted/runtime/StopMacroExpansion.scala"),
1357-
file(s"${baseDirectory.value}/src/scala/compiletime/Erased.scala"),
1358-
file(s"${baseDirectory.value}/src/scala/annotation/internal/onlyCapability.scala"),
1359-
file(s"${baseDirectory.value}/src/scala/runtime/VarArgsBuilder.scala"),
1360-
)
1361-
)
13621223

13631224
// ==============================================================================================
13641225
// ================================= NON-BOOTSTRAPPED PROJECTS ==================================
@@ -2848,8 +2709,8 @@ object Build {
28482709
)
28492710

28502711
def dottyLibrary(implicit mode: Mode): Project = mode match {
2851-
case NonBootstrapped => `scala3-library`
2852-
case Bootstrapped => `scala3-library-bootstrapped`
2712+
case NonBootstrapped => `scala3-library-nonbootstrapped`
2713+
case Bootstrapped => `scala3-library-bootstrapped-new`
28532714
}
28542715

28552716
def tastyCore(implicit mode: Mode): Project = mode match {

0 commit comments

Comments
 (0)