Skip to content

Backport "Fix typos in Build.scala" to LTS #20712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Backport "Fix typos in Build.scala" to LTS #20712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ object Build {
"-classpath" :: classpath :: beforeCp ::: fromCp.drop(2)
}

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

lazy val bootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
javaOptions ++= {
val jars = packageAll.value
Seq(
Expand All @@ -842,7 +842,7 @@ object Build {
)

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

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

Expand Down Expand Up @@ -1047,7 +1047,7 @@ object Build {

/** Test the tasty generated by `stdlib-bootstrapped`
*
* The tests are run with the bootstrapped compiler and the tasty inpector on the classpath.
* The tests are run with the bootstrapped compiler and the tasty inspector on the classpath.
* The classpath has the default `scala-library` and not `stdlib-bootstrapped`.
*
* The jar of `stdlib-bootstrapped` is provided for to the tests.
Expand Down Expand Up @@ -1448,14 +1448,14 @@ object Build {
.asDottyBench(Bootstrapped)
.settings(Jmh / run / mainClass := Some("org.openjdk.jmh.Main"))

val testcasesOutputDir = taskKey[Seq[String]]("Root directory where tests classses are generated")
val testcasesOutputDir = taskKey[Seq[String]]("Root directory where tests classes are generated")
val testcasesSourceRoot = taskKey[String]("Root directory where tests sources are generated")
val testDocumentationRoot = taskKey[String]("Root directory where tests documentation are stored")
val generateSelfDocumentation = taskKey[Unit]("Generate example documentation")
// Note: the two tasks below should be one, but a bug in Tasty prevents that
val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
val generateStableScala3Documentation = inputKey[Unit]("Generate documentation for stable dotty lib")
val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests")
val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, useful for debugging tests")

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

Expand Down
Loading