10000 Merge pull request #5610 from dwijnand/sbt · scala/scala@a3135bf · GitHub
[go: up one dir, main page]
Skip to content

Commit a3135bf

Browse files
lrytzlrytz
authored
Merge pull request #5610 from dwijnand/sbt
Fix how "sbt" is written
2 parents 246653f + f678a57 commit a3135bf

File tree

16 files changed

+22
-22
lines changed

16 files changed

+22
-22
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# Standard symbolic link to build/quick/bin
5151
/qbin
5252

53-
# Sbt's target directories
53+
# sbt's target directories
5454
/target/
5555
/project/target/
5656
/project/project/target/

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ bootstrap build locally.
9191
For history on how the current scheme was arrived at, see
9292
https://groups.google.com/d/topic/scala-internals/gp5JsM1E0Fo/discussion.
9393

94-
### Using the Sbt Build
94+
### Using the sbt Build
9595

9696
Core commands:
9797

‎project/MiMa.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object MiMa {
4949
"--curr", curr.getAbsolutePath,
5050
"--filters", filter.getAbsolutePath,
5151
"--generate-filters",
52-
// !!! Command line MiMa (which we call rathan the SBT Plugin for reasons alluded to in f2d0f1e85) incorrectly
52+
// !!! Command line MiMa (which we call rathan the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly
5353
// defaults to no checking (!) if this isn't specified. Fixed in https://github.com/typesafehub/migration-manager/pull/138
5454
// TODO: Try out the new "--direction both" mode of MiMa
5555
"--direction", "backwards"

‎project/PartestUtil.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object PartestUtil {
3535

3636
// HACK: if we parse `--srcpath scaladoc`, we overwrite this var. The parser for test file paths
3737
// then lazily creates the examples based on the current value.
38-
// TODO is there a cleaner way to do this with SBT's parser infrastructure?
38+
// TODO is there a cleaner way to do this with sbt's parser infrastructure?
3939
var srcPath = "files"
4040
var _testFiles: TestFiles = null
4141
def testFiles = {

‎project/Quiet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbt._
22
import Keys._
33

44
object Quiet {
5-
// Workaround SBT issue described:
5+
// Workaround sbt issue described:
66
//
77
// https://github.com/scala/scala-dev/issues/100
88
def silenceScalaBinaryVersionWarning = ivyConfiguration := {

‎project/ScalaOptionParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import sbt.complete.Parsers._
55
import sbt.complete._
66

77
object ScalaOptionParser {
8-
/** A SBT parser for the Scala command line runners (scala, scalac, etc) */
8+
/** An sbt parser for the Scala command line runners (scala, scalac, etc) */
99
def scalaParser(entryPoint: String, globalBase: File): Parser[String] = {
1010
def BooleanSetting(name: String): Parser[String] =
1111
token(name)

‎src/compiler/scala/tools/nsc/CompilationUnits.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ trait CompilationUnits { global: Global =>
5252
* To get their sourcefiles, you need to dereference with .sourcefile
5353
*/
5454
private[this] val _depends = mutable.HashSet[Symbol]()
55-
// SBT compatibility (SI-6875)
55+
// sbt compatibility (SI-6875)
5656
//
5757
// imagine we have a file named A.scala, which defines a trait named Foo and a module named Main
5858
// Main contains a call to a macro, which calls compileLate to define a mock for Foo
@@ -63,12 +63,12 @@ trait CompilationUnits { global: Global =>
6363
// * Virt35af32 depends on A (because it extends Foo from A)
6464
// * A depends on Virt35af32 (because it contains a macro expansion referring to FooMock from Virt35af32)
6565
//
66-
// after compiling A.scala, SBT will notice that it has a new source file named Virt35af32.
66+
// after compiling A.scala, sbt will notice that it has a new source file named Virt35af32.
6767
// it will also think that this file hasn't yet been compiled and since A depends on it
6868
// it will think that A needs to be recompiled.
6969
//
7070
// recompilation will lead to another macro expansion. that another macro expansion might choose to create a fresh mock,
71-
// producing another virtual file, say, Virtee509a, which will again trick SBT into thinking that A needs a recompile,
71+
// producing another virtual file, say, Virtee509a, which will again trick sbt into thinking that A needs a recompile,
7272
// which will lead to another macro expansion, which will produce another virtual file and so on
7373
def depends = if (exists && !source.file.isVirtual) _depends else mutable.HashSet[Symbol]()
7474

‎src/compiler/scala/tools/util/VerifyClass.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object VerifyClass {
3131
if (name endsWith ".jar") checkClassesInJar(name, cl)
3232
else checkClassesInDir(name, cl)
3333

34-
/** Attempts to load all classes on the classpath defined in the args string array. This method is meant to be used via reflection from tools like SBT or Ant. */
34+
/** Attempts to load all classes on the classpath defined in the args string array. This method is meant to be used via reflection from tools like sbt or Ant. */
3535
def run(args: Array[String]): java.util.Map[String, String] = {
3636
val urls = args.map(Path.apply).map(_.toFile.toURI.toURL).toArray
3737
println("As urls: " + urls.mkString(","))

‎src/library/scala/concurrent/SyncVar.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class SyncVar[A] {
9292
// whether or not the SyncVar is already defined. So, set has been
9393
// deprecated in order to eventually be able to make "setting" private
9494
@deprecated("use `put` to ensure a value cannot be overwritten without a corresponding `take`", "2.10.0")
95-
// NOTE: Used by SBT 0.13.0-M2 and below
95+
// NOTE: Used by sbt 0.13.0-M2 and below
9696
def set(x: A): Unit = setVal(x)
9797

9898
/** Place a value in the SyncVar. If the SyncVar already has a stored value,
@@ -112,7 +112,7 @@ class SyncVar[A] {
112112
// whether or not the SyncVar is already defined. So, unset has been
113113
// deprecated in order to eventually be able to make "unsetting" private
114114
@deprecated("use `take` to ensure a value is never discarded", "2.10.0")
115-
// NOTE: Used by SBT 0.13.0-M2 and below
115+
// NOTE: Used by sbt 0.13.0-M2 and below
116116
def unset(): Unit = synchronized {
117117
isDefined = false
118118
value = null.asInstanceOf[A]

‎src/library/scala/util/MurmurHash.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class MurmurHash[@specialized(Int,Long,Float,Double) T](seed: Int) extends (T =>
8282
* needs to be called to finalize the hash.
8383
*/
8484
@deprecated("use the object MurmurHash3 instead", "2.10.0")
85-
// NOTE: Used by SBT 0.13.0-M2 and below
85+
// NOTE: Used by sbt 0.13.0-M2 and below
8686
object MurmurHash {
8787
// Magic values used for MurmurHash's 32 bit hash.
8888
// Don't change these without consulting a hashing expert!

0 commit comments

Comments
 (0)
0