diff --git a/ivy/src/main/scala/sbt/Configuration.scala b/ivy/src/main/scala/sbt/Configuration.scala index db4ada450..58b5073b8 100644 --- a/ivy/src/main/scala/sbt/Configuration.scala +++ b/ivy/src/main/scala/sbt/Configuration.scala @@ -24,14 +24,14 @@ object Configurations { 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 optionalInternal(base: Configuration): Configuration = internal(base, base, Optional) lazy val Default = config("default") lazy val Compile = config("compile") lazy val IntegrationTest = config("it") extend (Runtime) - lazy val Provided = config("provided"); + lazy val Provided = config("provided") lazy val Docs = config("docs") lazy val Runtime = config("runtime") extend (Compile) lazy val Test = config("test") extend (Runtime) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index f6250705e..b9b715d0c 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -228,7 +228,7 @@ object Resolver { object sftp extends Define[SftpRepository] { 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 { /** * Constructs a file resolver with the given name. The patterns to use must be explicitly specified diff --git a/main/src/main/scala/sbt/Plugins.scala b/main/src/main/scala/sbt/Plugins.scala index 9b10a326f..52bcd288a 100644 --- a/main/src/main/scala/sbt/Plugins.scala +++ b/main/src/main/scala/sbt/Plugins.scala @@ -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. * * 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 * instance will be added only if the build user enables it, but it will automatically add both `Web` and `Javascript`. */ diff --git a/main/src/test/scala/PluginsTest.scala b/main/src/test/scala/PluginsTest.scala index eed8a1143..b7c4bf4a1 100644 --- a/main/src/test/scala/PluginsTest.scala +++ b/main/src/test/scala/PluginsTest.scala @@ -12,7 +12,7 @@ object PluginsTest extends Specification "enable plugins with trigger=allRequirements AND requirements met" in { 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) } "order enable plugins after required plugins" in {