diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-01 23:01:42 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-01 23:02:16 -0700 |
commit | f5097f96503dc60f773f68f97beea9e61822d7ee (patch) | |
tree | 4edb612fc319fbdac24040924fbafa762234b194 /scalalib/src | |
parent | bbd162d3518b4e294a9ad0d6c1d6f23e680f4712 (diff) | |
download | mill-f5097f96503dc60f773f68f97beea9e61822d7ee.tar.gz mill-f5097f96503dc60f773f68f97beea9e61822d7ee.tar.bz2 mill-f5097f96503dc60f773f68f97beea9e61822d7ee.zip |
revert #254 to fix bootstrapping https://github.com/lihaoyi/mill/issues/268
Diffstat (limited to 'scalalib/src')
-rw-r--r-- | scalalib/src/mill/scalalib/Dep.scala | 14 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/Ivy.scala | 8 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/Pom.scala | 28 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/settings.scala | 16 |
4 files changed, 12 insertions, 54 deletions
diff --git a/scalalib/src/mill/scalalib/Dep.scala b/scalalib/src/mill/scalalib/Dep.scala index f67eed03..bd7fce4f 100644 --- a/scalalib/src/mill/scalalib/Dep.scala +++ b/scalalib/src/mill/scalalib/Dep.scala @@ -3,20 +3,6 @@ import mill.util.JsonFormatters._ import upickle.default.{macroRW, ReadWriter => RW} sealed trait Dep { def configure(attributes: coursier.Attributes): Dep - def exclude(exclusions: (String, String)*): Dep = - this match { - case dep : Dep.Java => dep.copy(dep = dep.dep.copy(exclusions = dep.dep.exclusions ++ exclusions)) - case dep : Dep.Scala => dep.copy(dep = dep.dep.copy(exclusions = dep.dep.exclusions ++ exclusions)) - case dep : Dep.Point => dep.copy(dep = dep.dep.copy(exclusions = dep.dep.exclusions ++ exclusions)) - } - def excludeOrg(organizations: String*): Dep = exclude(organizations.map(_ -> "*"): _*) - def excludeName(names: String*): Dep = exclude(names.map("*" -> _): _*) - def withConfiguration(configuration: String): Dep = - this match { - case dep : Dep.Java => dep.copy(dep = dep.dep.copy(configuration = configuration)) - case dep : Dep.Scala => dep.copy(dep = dep.dep.copy(configuration = configuration)) - case dep : Dep.Point => dep.copy(dep = dep.dep.copy(configuration = configuration)) - } } object Dep{ diff --git a/scalalib/src/mill/scalalib/publish/Ivy.scala b/scalalib/src/mill/scalalib/publish/Ivy.scala index 3b271fa8..644e2c53 100644 --- a/scalalib/src/mill/scalalib/publish/Ivy.scala +++ b/scalalib/src/mill/scalalib/publish/Ivy.scala @@ -41,12 +41,8 @@ object Ivy { } private def renderDependency(dep: Dependency) = { - if (dep.exclusions.isEmpty) - <dependency org={dep.artifact.group} name={dep.artifact.id} rev={dep.artifact.version} conf={s"${dep.scope}->default(${dep.configuration.getOrElse("compile")})"} /> - else - <dependency org={dep.artifact.group} name={dep.artifact.id} rev={dep.artifact.version} conf={s"${dep.scope}->default(${dep.configuration.getOrElse("compile")})"}> - {dep.exclusions.map(ex => <exclude org={ex._1} name={ex._2} matcher="exact"/>).toSeq} - </dependency> + val scope = scopeToConf(dep.scope) + <dependency org={dep.artifact.group} name={dep.artifact.id} rev={dep.artifact.version} conf={s"$scope->default(compile)"}></dependency> } private def scopeToConf(s: Scope): String = s match { diff --git a/scalalib/src/mill/scalalib/publish/Pom.scala b/scalalib/src/mill/scalalib/publish/Pom.scala index 3c8ba4dc..1a86e7de 100644 --- a/scalalib/src/mill/scalalib/publish/Pom.scala +++ b/scalalib/src/mill/scalalib/publish/Pom.scala @@ -90,28 +90,12 @@ object Pom { case Scope.Test => <scope>test</scope> case Scope.Runtime => <scope>runtime</scope> } - if (d.exclusions.isEmpty) - <dependency> - <groupId>{d.artifact.group}</groupId> - <artifactId>{d.artifact.id}</artifactId> - <version>{d.artifact.version}</version> - {scope} - </dependency> - else - <dependency> - <groupId>{d.artifact.group}</groupId> - <artifactId>{d.artifact.id}</artifactId> - <version>{d.artifact.version}</version> - <exclusions> - {d.exclusions.map(ex => - <exclude> - <groupId>{ex._1}</groupId> - <artifactId>{ex._2}</artifactId> - </exclude> - )}.toSeq - </exclusions> - {scope} - </dependency> + <dependency> + <groupId>{d.artifact.group}</groupId> + <artifactId>{d.artifact.id}</artifactId> + <version>{d.artifact.version}</version> + {scope} + </dependency> } } diff --git a/scalalib/src/mill/scalalib/publish/settings.scala b/scalalib/src/mill/scalalib/publish/settings.scala index 34f7e7ad..1076fb41 100644 --- a/scalalib/src/mill/scalalib/publish/settings.scala +++ b/scalalib/src/mill/scalalib/publish/settings.scala @@ -15,9 +15,7 @@ object Artifact { case Dep.Java(dep, cross) => Dependency( Artifact(dep.module.organization, dep.module.name, dep.version), - Scope.Compile, - if (dep.configuration == "" ) None else Some(dep.configuration), - dep.exclusions.toList + Scope.Compile ) case Dep.Scala(dep, cross) => Dependency( @@ -26,9 +24,7 @@ object Artifact { s"${dep.module.name}_${scalaBin}", dep.version ), - Scope.Compile, - if (dep.configuration == "") None else Some(dep.configuration), - dep.exclusions.toList + Scope.Compile ) case Dep.Point(dep, cross) => Dependency( @@ -37,9 +33,7 @@ object Artifact { s"${dep.module.name}_${scalaFull}", dep.version ), - Scope.Compile, - if (dep.configuration == "") None else Some(dep.configuration), - dep.exclusions.toList + Scope.Compile ) } } @@ -55,9 +49,7 @@ object Scope { case class Dependency( artifact: Artifact, - scope: Scope, - configuration: Option[String] = None, - exclusions: Seq[(String, String)] = Nil + scope: Scope ) case class Developer( |