diff --git a/main/src/main/scala/sbt/internal/PluginDiscovery.scala b/main/src/main/scala/sbt/internal/PluginDiscovery.scala index c5f17950e..00562c010 100644 --- a/main/src/main/scala/sbt/internal/PluginDiscovery.scala +++ b/main/src/main/scala/sbt/internal/PluginDiscovery.scala @@ -42,8 +42,8 @@ object PluginDiscovery { "sbt.plugins.JUnitXmlReportPlugin" -> sbt.plugins.JUnitXmlReportPlugin, "sbt.plugins.Giter8TemplatePlugin" -> sbt.plugins.Giter8TemplatePlugin ) - val detectedAutoPugins = discover[AutoPlugin](AutoPlugins) - val allAutoPlugins = (defaultAutoPlugins ++ detectedAutoPugins.modules) map { + val detectedAutoPlugins = discover[AutoPlugin](AutoPlugins) + val allAutoPlugins = (defaultAutoPlugins ++ detectedAutoPlugins.modules) map { case (name, value) => DetectedAutoPlugin(name, value, sbt.Plugins.hasAutoImportGetter(value, loader)) } diff --git a/main/src/main/scala/sbt/internal/PluginsDebug.scala b/main/src/main/scala/sbt/internal/PluginsDebug.scala index f44301cbe..18dfdc277 100644 --- a/main/src/main/scala/sbt/internal/PluginsDebug.scala +++ b/main/src/main/scala/sbt/internal/PluginsDebug.scala @@ -235,7 +235,7 @@ private[sbt] object PluginsDebug { val blockingExcludes = initialExcludes & minRequiredPlugins // The model that results when the minimal plugins are enabled and the minimal plugins are excluded. - // This can include more plugins than just `minRequiredPlugins` because the plguins required for `plugin` + // This can include more plugins than just `minRequiredPlugins` because the plugins required for `plugin` // might activate other plugins as well. val incrementalInputs = and(includeAll(minRequiredPlugins ++ initialPlugins), excludeAll(minAbsentPlugins ++ initialExcludes -- minRequiredPlugins)) val incrementalModel = context.deducePlugin(incrementalInputs, context.log).toSet diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt b/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt index 383634db3..76548462d 100644 --- a/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). cacheDir / "org.apache.geronimo.specs" / "geronimo-jta_1.1_spec" / "ivy-1.1.1.xml" val lines = IO.read(xmlFile) if(lines.isEmpty) sys.error(s"Unable to read $xmlFile, could not resolve geronimo...") - // Note: We do not do this if the maven plguin is enabled, because there is no rewrite of ivy.xml, extra attributes + // Note: We do not do this if the maven plugin is enabled, because there is no rewrite of ivy.xml, extra attributes // are handled in a different mechanism. This is a hacky mechanism to detect that. val isMavenResolver = updateOptions.value.resolverConverter != PartialFunction.empty if(!isMavenResolver) assert(lines contains "xmlns:e", s"Failed to appropriately modify ivy.xml file for sbt extra attributes!\n$lines")