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

Merge pull request #129 from eed3si9n/wip/macrofix 

Expose Configuration factory
This commit is contained in:
eugene yokota 2017-07-15 11:14:14 -04:00 committed by GitHub
parent f8d3718d28 f8c656e74d
commit 0243eb7492
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
View File

@ -238,7 +238,7 @@ final class IvySbt(val configuration: IvyConfiguration) { self =>
import ic._
val moduleID = newConfiguredModuleID(module, moduleInfo, configurations)
IvySbt.setConflictManager(moduleID, conflictManager, ivy.getSettings)
val defaultConf = defaultConfiguration getOrElse Configuration(
val defaultConf = defaultConfiguration getOrElse Configuration.of(
"Default",
ModuleDescriptor.DEFAULT_CONFIGURATION)
log.debug(

15
librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala
View File

@ -67,13 +67,14 @@ final class Configuration private[sbt] (
def toConfigRef: ConfigRef = ConfigRef(name)
}
object Configuration {
private[sbt] def apply(id: String, name: String): Configuration =
// Don't call this directly. It's intended to be used from config macro.
def of(id: String, name: String): Configuration =
new Configuration(id, name, "", true, Vector.empty, true)
private[sbt] def apply(id: String,
name: String,
description: String,
isPublic: Boolean,
extendsConfigs: Vector[sbt.librarymanagement.Configuration],
transitive: Boolean): Configuration =
def of(id: String,
name: String,
description: String,
isPublic: Boolean,
extendsConfigs: Vector[sbt.librarymanagement.Configuration],
transitive: Boolean): Configuration =
new Configuration(id, name, description, isPublic, extendsConfigs, transitive)
}

41
librarymanagement/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala
View File

@ -30,25 +30,25 @@ object Configurations {
}
private[sbt] def internal(base: Configuration, ext: Configuration*) =
Configuration(base.id + "Internal", base.name + "-internal").extend(ext: _*).hide
Configuration.of(base.id + "Internal", base.name + "-internal").extend(ext: _*).hide
private[sbt] def fullInternal(base: Configuration): Configuration =
internal(base, base, Optional, Provided)
private[sbt] def optionalInternal(base: Configuration): Configuration =
internal(base, base, Optional)
lazy val Default = Configuration("Default", "default")
lazy val Compile = Configuration("Compile", "compile")
lazy val IntegrationTest = Configuration("IntegrationTest", "it") extend (Runtime)
lazy val Provided = Configuration("Provided", "provided")
lazy val Runtime = Configuration("Runtime", "runtime") extend (Compile)
lazy val Test = Configuration("Test", "test") extend (Runtime)
lazy val System = Configuration("System", "system")
lazy val Optional = Configuration("Optional", "optional")
lazy val Pom = Configuration("Pom", "pom")
lazy val Default = Configuration.of("Default", "default")
lazy val Compile = Configuration.of("Compile", "compile")
lazy val IntegrationTest = Configuration.of("IntegrationTest", "it") extend (Runtime)
lazy val Provided = Configuration.of("Provided", "provided")
lazy val Runtime = Configuration.of("Runtime", "runtime") extend (Compile)
lazy val Test = Configuration.of("Test", "test") extend (Runtime)
lazy val System = Configuration.of("System", "system")
lazy val Optional = Configuration.of("Optional", "optional")
lazy val Pom = Configuration.of("Pom", "pom")
lazy val ScalaTool = Configuration("ScalaTool", "scala-tool").hide
lazy val CompilerPlugin = Configuration("CompilerPlugin", "plugin").hide
lazy val Component = Configuration("Component", "component").hide
lazy val ScalaTool = Configuration.of("ScalaTool", "scala-tool").hide
lazy val CompilerPlugin = Configuration.of("CompilerPlugin", "plugin").hide
lazy val Component = Configuration.of("Component", "component").hide
private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)
private[sbt] val DefaultIvyConfiguration = defaultConfiguration(false)
@ -87,12 +87,17 @@ abstract class ConfigurationExtra {
require(description != null)
def describedAs(newDescription: String) =
Configuration(id, name, newDescription, isPublic, extendsConfigs, transitive)
Configuration.of(id, name, newDescription, isPublic, extendsConfigs, transitive)
def extend(configs: Configuration*) =
Configuration(id, name, description, isPublic, configs.toVector ++ extendsConfigs, transitive)
Configuration.of(id,
name,
description,
isPublic,
configs.toVector ++ extendsConfigs,
transitive)
def notTransitive = intransitive
def intransitive = Configuration(id, name, description, isPublic, extendsConfigs, false)
def hide = Configuration(id, name, description, false, extendsConfigs, transitive)
def intransitive = Configuration.of(id, name, description, isPublic, extendsConfigs, false)
def hide = Configuration.of(id, name, description, false, extendsConfigs, transitive)
}
private[sbt] object ConfigurationMacro {
@ -105,7 +110,7 @@ private[sbt] object ConfigurationMacro {
methodName =>
s"""$methodName must be directly assigned to a val, such as `val x = $methodName`.""")
val id = c.Expr[String](Literal(Constant(enclosingValName)))
reify { Configuration(id.splice, name.splice) }
reify { Configuration.of(id.splice, name.splice) }
}
def definingValName(c: blackbox.Context, invalidEnclosingTree: String => String): String = {