luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1425 from jaceklaskowski/typo-fixes 

Typo fixes + removing unnecessary semicolons
This commit is contained in:
eugene yokota 2014-06-24 22:58:59 -04:00
parent 137805ed01 ebbb77e200
commit 77384a8a05
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ivy/src/main/scala/sbt/Configuration.scala
View File

@ -24,14 +24,14 @@ object Configurations {
case _ => c case _ => c
} }
def internal(base: Configuration, ext: Configuration*) = config(base.name + "-internal") extend (ext: _*) hide; def internal(base: Configuration, ext: Configuration*) = config(base.name + "-internal") extend (ext: _*) hide
def fullInternal(base: Configuration): Configuration = internal(base, base, Optional, Provided) def fullInternal(base: Configuration): Configuration = internal(base, base, Optional, Provided)
def optionalInternal(base: Configuration): Configuration = internal(base, base, Optional) def optionalInternal(base: Configuration): Configuration = internal(base, base, Optional)
lazy val Default = config("default") lazy val Default = config("default")
lazy val Compile = config("compile") lazy val Compile = config("compile")
lazy val IntegrationTest = config("it") extend (Runtime) lazy val IntegrationTest = config("it") extend (Runtime)
lazy val Provided = config("provided"); lazy val Provided = config("provided")
lazy val Docs = config("docs") lazy val Docs = config("docs")
lazy val Runtime = config("runtime") extend (Compile) lazy val Runtime = config("runtime") extend (Compile)
lazy val Test = config("test") extend (Runtime) lazy val Test = config("test") extend (Runtime)

2
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -228,7 +228,7 @@ object Resolver {
object sftp extends Define[SftpRepository] { object sftp extends Define[SftpRepository] {
protected def construct(name: String, connection: SshConnection, patterns: Patterns) = SftpRepository(name, connection, patterns) protected def construct(name: String, connection: SshConnection, patterns: Patterns) = SftpRepository(name, connection, patterns)
} }
/** A factory to construct an interface to an Ivy filesytem resolver. */ /** A factory to construct an interface to an Ivy filesystem resolver. */
object file { object file {
/** /**
* Constructs a file resolver with the given name. The patterns to use must be explicitly specified * Constructs a file resolver with the given name. The patterns to use must be explicitly specified

2
main/src/main/scala/sbt/Plugins.scala
View File

@ -55,7 +55,7 @@ abstract class AutoPlugin extends Plugins.Basic with PluginsFunctions
/** Determines whether this AutoPlugin will be activated for this project when the `requires` clause is satisfied. /** Determines whether this AutoPlugin will be activated for this project when the `requires` clause is satisfied.
* *
* When this method returns `allRequirements`, and `requires` method returns `Web && Javascript`, this plugin * When this method returns `allRequirements`, and `requires` method returns `Web && Javascript`, this plugin
* instance will be added automatically if the `Web` and `Javascript` plugins are enbled. * instance will be added automatically if the `Web` and `Javascript` plugins are enabled.
* *
* When this method returns `noTrigger`, and `requires` method returns `Web && Javascript`, this plugin * When this method returns `noTrigger`, and `requires` method returns `Web && Javascript`, this plugin
* instance will be added only if the build user enables it, but it will automatically add both `Web` and `Javascript`. */ * instance will be added only if the build user enables it, but it will automatically add both `Web` and `Javascript`. */

2
main/src/test/scala/PluginsTest.scala
View File

@ -12,7 +12,7 @@ object PluginsTest extends Specification
"enable plugins with trigger=allRequirements AND requirements met" in { "enable plugins with trigger=allRequirements AND requirements met" in {
deducePlugin(A && B, log) must contain(Q) deducePlugin(A && B, log) must contain(Q)
} }
"enable transive plugins with trigger=allRequirements AND requirements met" in { "enable transitive plugins with trigger=allRequirements AND requirements met" in {
deducePlugin(A && B, log) must contain(R) deducePlugin(A && B, log) must contain(R)
} }
"order enable plugins after required plugins" in { "order enable plugins after required plugins" in {