mirror of https://github.com/sbt/sbt.git
Adjusting to 0.13 changes
This commit is contained in:
parent
2c654b2d90
commit
cc80d216ab
|
|
@ -106,7 +106,7 @@ final class DetectedPlugins(val plugins: DetectedModules[Plugin], val autoPlugin
|
|||
else None
|
||||
}))
|
||||
/** A function to select the right [[AutoPlugin]]s from [[autoPlugins]] for a [[Project]]. */
|
||||
lazy val deducePlugins: (Plugins, Logger) => Seq[AutoPlugin] = Plugins.deducer(autoPlugins.values.toList)
|
||||
lazy val deducePlugins: (Plugins, Logger) => Seq[AutoPlugin] = Plugins.deducer(autoPlugins.toList map {_.value})
|
||||
}
|
||||
|
||||
/** The built and loaded build definition project.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import sbttest.{Q}
|
||||
import sbttest.{Q, S}
|
||||
|
||||
// disablePlugins(Q) will prevent R from being auto-added
|
||||
lazy val projA = project.addPlugins(A, B).disablePlugins(Q)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ object Imports
|
|||
|
||||
object X extends AutoPlugin {
|
||||
override lazy val autoImport = Imports
|
||||
def select = Plugins.empty
|
||||
def requires = Plugins.empty
|
||||
def trigger = noTrigger
|
||||
}
|
||||
|
||||
import Imports._
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ object Imports {
|
|||
|
||||
object C extends AutoPlugin {
|
||||
override lazy val autoImport = Imports
|
||||
def select = Plugins.empty
|
||||
def requires = empty
|
||||
def trigger = noTrigger
|
||||
}
|
||||
|
||||
import Imports._
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[app]
|
||||
org: ${sbt.organization-org.scala-sbt}
|
||||
name: sbt
|
||||
version: ${sbt.version-read(sbt.version)[0.13.2-SNAPSHOT]}
|
||||
version: ${sbt.version-read(sbt.version)[0.13.3-SNAPSHOT]}
|
||||
class: sbt.xMain
|
||||
components: xsbti,extra
|
||||
cross-versioned: ${sbt.cross.versioned-false}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[app]
|
||||
org: ${sbt.organization-org.scala-sbt}
|
||||
name: sbt
|
||||
version: ${sbt.version-read(sbt.version)[0.13.2-SNAPSHOT]}
|
||||
version: ${sbt.version-read(sbt.version)[0.13.3-SNAPSHOT]}
|
||||
class: sbt.ScriptMain
|
||||
components: xsbti,extra
|
||||
cross-versioned: ${sbt.cross.versioned-false}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[app]
|
||||
org: ${sbt.organization-org.scala-sbt}
|
||||
name: sbt
|
||||
version: ${sbt.version-read(sbt.version)[0.13.2-SNAPSHOT]}
|
||||
version: ${sbt.version-read(sbt.version)[0.13.3-SNAPSHOT]}
|
||||
class: sbt.ConsoleMain
|
||||
components: xsbti,extra
|
||||
cross-versioned: ${sbt.cross.versioned-false}
|
||||
|
|
|
|||
Loading…
Reference in New Issue