diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9cfa80cbb..92abd3324 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ The subject of the bug report doesn't matter. A more descriptive subject is cert If possible, please format code or console outputs. -On Github it's: +On GitHub it's: ```scala name := "foo" diff --git a/README.md b/README.md index f8d3e59ec..521b0edd0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ sbt 1.x --------- This is the 1.x series of sbt. The source code of sbt is split across -several Github repositories, including this one. +several GitHub repositories, including this one. - [sbt/io][sbt/io] hosts `sbt.io` module. - [sbt/util][sbt/util] hosts a collection of internally used modules. diff --git a/main-actions/src/main/scala/sbt/TestResultLogger.scala b/main-actions/src/main/scala/sbt/TestResultLogger.scala index 01640def6..d7675fb34 100644 --- a/main-actions/src/main/scala/sbt/TestResultLogger.scala +++ b/main-actions/src/main/scala/sbt/TestResultLogger.scala @@ -50,7 +50,7 @@ object TestResultLogger { /** A `TestResultLogger` that does nothing. */ val Null = const(_ => ()) - /** SBT's default `TestResultLogger`. Use `copy()` to change selective portions. */ + /** sbt's default `TestResultLogger`. Use `copy()` to change selective portions. */ val Default = Defaults.Main() /** Twist on the default which is completely silent when the subject module doesn't contain any tests. */ @@ -84,7 +84,7 @@ object TestResultLogger { object Defaults { - /** SBT's default `TestResultLogger`. Use `copy()` to change selective portions. */ + /** sbt's default `TestResultLogger`. Use `copy()` to change selective portions. */ case class Main( printStandard_? : Output => Boolean = Defaults.printStandard_?, printSummary: TestResultLogger = Defaults.printSummary, diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index de3266bee..a38f143c3 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -449,7 +449,7 @@ object Keys { val skip = taskKey[Boolean]("For tasks that support it (currently only 'compile', 'update', and 'publish'), setting skip to true will force the task to not to do its work. This exact semantics may vary by task.").withRank(BSetting) val templateResolverInfos = settingKey[Seq[TemplateResolverInfo]]("Template resolvers used for 'new'.").withRank(BSetting) val interactionService = taskKey[InteractionService]("Service used to ask for user input through the current user interface(s).").withRank(CTask) - val insideCI = SettingKey[Boolean]("insideCI", "Determines if the SBT is running in a Continuous Integration environment", AMinusSetting) + val insideCI = SettingKey[Boolean]("insideCI", "Determines if the sbt is running in a Continuous Integration environment", AMinusSetting) // sbt server internal val collectAnalyses = taskKey[Unit]("Collect analysis file locations for later use.") diff --git a/main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala index 59db5d4f3..721665e31 100644 --- a/main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala +++ b/main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala @@ -130,7 +130,7 @@ object CoursierArtifactsTasks { val stdArtifactsSet = sbtArtifacts.flatMap(_.map { case (_, a) => a }.toSeq).toSet - // Second-way of getting artifacts from SBT + // Second-way of getting artifacts from sbt // No obvious way of getting the corresponding publishArtifact value for the ones // only here, it seems. val extraSbtArtifacts = getOpt( @@ -139,7 +139,7 @@ object CoursierArtifactsTasks { ).getOrElse(Nil) .filterNot(stdArtifactsSet) - // Seems that SBT does that - if an artifact has no configs, + // Seems that sbt does that - if an artifact has no configs, // it puts it in all of them. See for example what happens to // the standalone JAR artifact of the coursier cli module. def allConfigsIfEmpty(configs: Iterable[ConfigRef]): Iterable[ConfigRef] = diff --git a/sbt/src/sbt-test/project/continuations/src/main/scala/Example.scala b/sbt/src/sbt-test/project/continuations/src/main/scala/Example.scala index c93d82ac7..393eb3374 100644 --- a/sbt/src/sbt-test/project/continuations/src/main/scala/Example.scala +++ b/sbt/src/sbt-test/project/continuations/src/main/scala/Example.scala @@ -4,7 +4,7 @@ object Example { val x = reset { - shift { k: (Int=>Int) => + shift { k: (Int => Int) => k(k(k(7))) } + 1 } * 2 diff --git a/sbt/src/sbt-test/tests/junit-xml-report/src/test/scala/junit-tests.scala b/sbt/src/sbt-test/tests/junit-xml-report/src/test/scala/junit-tests.scala index e2843e233..897610825 100644 --- a/sbt/src/sbt-test/tests/junit-xml-report/src/test/scala/junit-tests.scala +++ b/sbt/src/sbt-test/tests/junit-xml-report/src/test/scala/junit-tests.scala @@ -27,7 +27,7 @@ package another.pkg { package console.test.pkg { // we won't check console output in the report - // until SBT supports that + // until sbt supports that class ConsoleTests { @Test def sayHello(): Unit = { diff --git a/vscode-sbt-scala/client/src/extension.ts b/vscode-sbt-scala/client/src/extension.ts index 987504520..4ccebed75 100644 --- a/vscode-sbt-scala/client/src/extension.ts +++ b/vscode-sbt-scala/client/src/extension.ts @@ -34,7 +34,7 @@ export async function activate(context: ExtensionContext) { terminal = vscode.window.createTerminal(`sbt`); terminal.show(); terminal.sendText("sbt"); - // Wait for SBT server to start + // Wait for sbt server to start let retries = 60; while (retries > 0) { retries--;