@@ -816,7 +816,7 @@ object Build {
816
816
" -classpath" :: classpath :: beforeCp ::: fromCp.drop(2 )
817
817
}
818
818
819
- lazy val nonBootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
819
+ lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
820
820
// packageAll packages all and then returns a map with the abs location
821
821
packageAll := Def .taskDyn { // Use a dynamic task to avoid loops when loading the settings
822
822
Def .task {
@@ -843,7 +843,7 @@ object Build {
843
843
(Test / javaOptions) += " -Xss2m"
844
844
)
845
845
846
- lazy val bootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
846
+ lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
847
847
javaOptions ++= {
848
848
val jars = packageAll.value
849
849
Seq (
@@ -866,7 +866,7 @@ object Build {
866
866
)
867
867
868
868
def dottyCompilerSettings (implicit mode : Mode ): sbt.Def .SettingsDefinition =
869
- if (mode == NonBootstrapped ) nonBootstrapedDottyCompilerSettings else bootstrapedDottyCompilerSettings
869
+ if (mode == NonBootstrapped ) nonBootstrappedDottyCompilerSettings else bootstrappedDottyCompilerSettings
870
870
871
871
lazy val `scala3-compiler` = project.in(file(" compiler" )).asDottyCompiler(NonBootstrapped )
872
872
@@ -1036,10 +1036,10 @@ object Build {
1036
1036
}),
1037
1037
(Compile / sources) := {
1038
1038
val files = (Compile / sources).value
1039
- val overwritenSourcesDir = (Compile / scalaSource).value
1040
- val overwritenSources = files.flatMap(_.relativeTo(overwritenSourcesDir )).toSet
1039
+ val overwrittenSourcesDir = (Compile / scalaSource).value
1040
+ val overwrittenSources = files.flatMap(_.relativeTo(overwrittenSourcesDir )).toSet
1041
1041
val reference = (Compile / sourceManaged).value / " scala-library-src"
1042
- files.filterNot(_.relativeTo(reference).exists(overwritenSources ))
1042
+ files.filterNot(_.relativeTo(reference).exists(overwrittenSources ))
1043
1043
},
1044
1044
(Test / managedClasspath) ~= {
1045
1045
_.filterNot(file => file.data.getName == s " scala-library- $stdlibBootstrappedVersion.jar " )
@@ -1066,11 +1066,11 @@ object Build {
1066
1066
val minorVersion = previousDottyVersion.split('.' )(1 )
1067
1067
// TODO find a way around this and test in the CI
1068
1068
streams.value.log.warn(
1069
- s """ To allow TASTy-MiMa to read TASTy files generated by this vesion of the compile you must:
1069
+ s """ To allow TASTy-MiMa to read TASTy files generated by this version of the compile you must:
1070
1070
| * Modify the TASTy version to the latest stable release (latest version supported by TASTy-MiMa) in in tasty/src/dotty/tools/tasty/TastyFormat.scala
1071
1071
| - final val MinorVersion = $minorVersion
1072
1072
| - final val ExperimentalVersion = 0
1073
- | * Clean everiting to generate a compiler with those new TASTy vesrions
1073
+ | * Clean everything to generate a compiler with those new TASTy versions
1074
1074
| * Run scala2-library-bootstrapped/tastyMiMaReportIssues
1075
1075
| """ .stripMargin)
1076
1076
@@ -1144,7 +1144,7 @@ object Build {
1144
1144
* The sources in src are compiled using TASTy from scala2-library-tasty but then run
1145
1145
* with the scala-library compiled be Scala 2.
1146
1146
*
1147
- * The tests are run with the bootstrapped compiler and the tasty inpector on the classpath.
1147
+ * The tests are run with the bootstrapped compiler and the tasty inspector on the classpath.
1148
1148
* The classpath has the default `scala-library` and not `scala2-library-bootstrapped`.
1149
1149
*
1150
1150
* The jar of `scala2-library-bootstrapped` is provided for to the tests.
@@ -1557,14 +1557,14 @@ object Build {
1557
1557
.asDottyBench(Bootstrapped )
1558
1558
.settings(Jmh / run / mainClass := Some (" org.openjdk.jmh.Main" ))
1559
1559
1560
- val testcasesOutputDir = taskKey[Seq [String ]](" Root directory where tests classses are generated" )
1560
+ val testcasesOutputDir = taskKey[Seq [String ]](" Root directory where tests classes are generated" )
1561
1561
val testcasesSourceRoot = taskKey[String ](" Root directory where tests sources are generated" )
1562
1562
val testDocumentationRoot = taskKey[String ](" Root directory where tests documentation are stored" )
1563
1563
val generateSelfDocumentation = taskKey[Unit ](" Generate example documentation" )
1564
1564
// Note: the two tasks below should be one, but a bug in Tasty prevents that
1565
1565
val generateScalaDocumentation = inputKey[Unit ](" Generate documentation for dotty lib" )
1566
1566
val generateStableScala3Documentation = inputKey[Unit ](" Generate documentation for stable dotty lib" )
1567
- val generateTestcasesDocumentation = taskKey[Unit ](" Generate documentation for testcases, usefull for debugging tests" )
1567
+ val generateTestcasesDocumentation = taskKey[Unit ](" Generate documentation for testcases, useful for debugging tests" )
1568
1568
1569
1569
val generateReferenceDocumentation = inputKey[Unit ](" Generate language reference documentation for Scala 3" )
1570
1570
0 commit comments