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

logic system/auto-plugins: Provide deprecated methods for binary compatibility

This commit is contained in:
Mark Harrah 2014-01-24 14:19:18 -05:00
parent 30658f98bb
commit 7a38338509
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/scala/sbt/BuildStructure.scala
View File

@ -112,16 +112,16 @@ final class DetectedPlugins(val plugins: DetectedModules[Plugin], val autoImport
*/
final class LoadedPlugins(val base: File, val pluginData: PluginData, val loader: ClassLoader, val detected: DetectedPlugins)
{
/*
// TODO: uncomment before COMMIT for compatibility
@deprecated("Use the primary constructor.", "0.13.2")
def this(base: File, pluginData: PluginData, loader: ClassLoader, plugins: Seq[Plugin], pluginNames: Seq[String]) =
this(base, pluginData, loader, DetectedPlugins(DetectedModules(pluginNames zip plugins), DetectedModules(Nil), DetectedModules(Nil), DetectedModules(Nil)))
this(base, pluginData, loader,
new DetectedPlugins(new DetectedModules(pluginNames zip plugins), new DetectedModules(Nil), new DetectedModules(Nil), new DetectedModules(Nil))
)
@deprecated("Use detected.plugins.values.", "0.13.2")
val plugins = detected.plugins.values
val plugins: Seq[Plugin] = detected.plugins.values
@deprecated("Use detected.plugins.names.", "0.13.2")
val pluginNames = detected.plugins.names
*/
val pluginNames: Seq[String] = detected.plugins.names
def fullClasspath: Seq[Attributed[File]] = pluginData.classpath
def classpath = data(fullClasspath)

10
main/src/main/scala/sbt/Load.scala
View File

@ -609,9 +609,6 @@ object Load
config.evalPluginDef(pluginDef, pluginState)
}
/*
// TODO: UNCOMMENT BEFORE COMMIT
@deprecated("Use ModuleUtilities.getCheckedObjects[Build].", "0.13.2")
def loadDefinitions(loader: ClassLoader, defs: Seq[String]): Seq[Build] =
defs map { definition => loadDefinition(loader, definition) }
@ -619,7 +616,6 @@ object Load
@deprecated("Use ModuleUtilities.getCheckedObject[Build].", "0.13.2")
def loadDefinition(loader: ClassLoader, definition: String): Build =
ModuleUtilities.getObject(definition, loader).asInstanceOf[Build]
*/
def loadPlugins(dir: File, data: PluginData, loader: ClassLoader): sbt.LoadedPlugins =
new sbt.LoadedPlugins(dir, data, loader, autoDetect(data, loader))
@ -673,12 +669,9 @@ object Load
def getPluginNames(classpath: Seq[Attributed[File]], loader: ClassLoader): Seq[String] =
discoverModuleNames(classpath, loader, AutoBinaryResource.Plugins, classOf[Plugin].getName)
/*
TODO: UNCOMMENT BEFORE COMMIT
@deprecated("Explicitly specify the resource name.", "0.13.2")
def binaryPlugins(classpath: Seq[File], loader: ClassLoader): Seq[String] =
binaryPlugins(classpath, loader, AutoBinaryResource.Plugins)
*/
/** Relative paths of resources that list top-level modules that are available.
* Normally, the classes for those modules will be in the same classpath entry as the resource. */
@ -698,8 +691,6 @@ TODO: UNCOMMENT BEFORE COMMIT
def onClasspath(classpath: Seq[File])(url: URL): Boolean =
IO.urlAsFile(url) exists (classpath.contains _)
/*
// TODO: UNCOMMENT BEFORE COMMIT
@deprecated("Use ModuleUtilities.getCheckedObjects[Plugin].", "0.13.2")
def loadPlugins(loader: ClassLoader, pluginNames: Seq[String]): Seq[Plugin] =
ModuleUtilities.getCheckedObjects[Plugin](loader, pluginNames)
@ -710,7 +701,6 @@ TODO: UNCOMMENT BEFORE COMMIT
@deprecated("No longer used.", "0.13.2")
def findPlugins(analysis: inc.Analysis): Seq[String] = discover(analysis, "sbt.Plugin")
*/
def findDefinitions(analysis: inc.Analysis): Seq[String] = discover(analysis, "sbt.Build")
def discover(analysis: inc.Analysis, subclasses: String*): Seq[String] =