Skip to content

Commit 8c1cdc2

Browse files
Fix typos in Build.scala (#18689)
2 parents 231ca72 + 9e6d1b2 commit 8c1cdc2

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

project/Build.scala

+11-11
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ object Build {
816816
"-classpath" :: classpath :: beforeCp ::: fromCp.drop(2)
817817
}
818818

819-
lazy val nonBootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
819+
lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
820820
// packageAll packages all and then returns a map with the abs location
821821
packageAll := Def.taskDyn { // Use a dynamic task to avoid loops when loading the settings
822822
Def.task {
@@ -843,7 +843,7 @@ object Build {
843843
(Test / javaOptions) += "-Xss2m"
844844
)
845845

846-
lazy val bootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
846+
lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
847847
javaOptions ++= {
848848
val jars = packageAll.value
849849
Seq(
@@ -866,7 +866,7 @@ object Build {
866866
)
867867

868868
def dottyCompilerSettings(implicit mode: Mode): sbt.Def.SettingsDefinition =
869-
if (mode == NonBootstrapped) nonBootstrapedDottyCompilerSettings else bootstrapedDottyCompilerSettings
869+
if (mode == NonBootstrapped) nonBootstrappedDottyCompilerSettings else bootstrappedDottyCompilerSettings
870870

871871
lazy val `scala3-compiler` = project.in(file("compiler")).asDottyCompiler(NonBootstrapped)
872872

@@ -1036,10 +1036,10 @@ object Build {
10361036
}),
10371037
(Compile / sources) := {
10381038
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
10411041
val reference = (Compile/sourceManaged).value / "scala-library-src"
1042-
files.filterNot(_.relativeTo(reference).exists(overwritenSources))
1042+
files.filterNot(_.relativeTo(reference).exists(overwrittenSources))
10431043
},
10441044
(Test / managedClasspath) ~= {
10451045
_.filterNot(file => file.data.getName == s"scala-library-$stdlibBootstrappedVersion.jar")
@@ -1066,11 +1066,11 @@ object Build {
10661066
val minorVersion = previousDottyVersion.split('.')(1)
10671067
// TODO find a way around this and test in the CI
10681068
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:
10701070
| * Modify the TASTy version to the latest stable release (latest version supported by TASTy-MiMa) in in tasty/src/dotty/tools/tasty/TastyFormat.scala
10711071
| - final val MinorVersion = $minorVersion
10721072
| - 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
10741074
| * Run scala2-library-bootstrapped/tastyMiMaReportIssues
10751075
|""".stripMargin)
10761076

@@ -1144,7 +1144,7 @@ object Build {
11441144
* The sources in src are compiled using TASTy from scala2-library-tasty but then run
11451145
* with the scala-library compiled be Scala 2.
11461146
*
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.
11481148
* The classpath has the default `scala-library` and not `scala2-library-bootstrapped`.
11491149
*
11501150
* The jar of `scala2-library-bootstrapped` is provided for to the tests.
@@ -1557,14 +1557,14 @@ object Build {
15571557
.asDottyBench(Bootstrapped)
15581558
.settings(Jmh / run / mainClass := Some("org.openjdk.jmh.Main"))
15591559

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")
15611561
val testcasesSourceRoot = taskKey[String]("Root directory where tests sources are generated")
15621562
val testDocumentationRoot = taskKey[String]("Root directory where tests documentation are stored")
15631563
val generateSelfDocumentation = taskKey[Unit]("Generate example documentation")
15641564
// Note: the two tasks below should be one, but a bug in Tasty prevents that
15651565
val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
15661566
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")
15681568

15691569
val generateReferenceDocumentation = inputKey[Unit]("Generate language reference documentation for Scala 3")
15701570

0 commit comments

Comments
 (0)