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

Merge pull request #21 from dwijnand/move-CompatibilityWarning 

Move CompatibilityWarning to sbt.internal.librarymanagement
This commit is contained in:
Dale Wijnand 2016-01-17 21:22:27 +00:00
parent 598ac3c34c ffcec2fa35
commit d017e2603e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ivy/src/main/scala/sbt/CompatibilityWarning.scala → librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala
View File

@ -1,4 +1,7 @@
package sbt package sbt.internal.librarymanagement
import sbt.librarymanagement._
import sbt.util.Logger
private[sbt] object CompatibilityWarning { private[sbt] object CompatibilityWarning {
def apply(module: IvySbt#Module, mavenStyle: Boolean, log: Logger): Unit = { def apply(module: IvySbt#Module, mavenStyle: Boolean, log: Logger): Unit = {
@ -19,7 +22,8 @@ private[sbt] object CompatibilityWarning {
s"""Found intransitive dependency ($m) while publishMavenStyle is true, but Maven repositories s"""Found intransitive dependency ($m) while publishMavenStyle is true, but Maven repositories
| do not support intransitive dependencies. Use exclusions instead so transitive dependencies | do not support intransitive dependencies. Use exclusions instead so transitive dependencies
| will be correctly excluded in dependent projects. | will be correctly excluded in dependent projects.
""".stripMargin) """.stripMargin
)
} else () } else ()
} }
} }

6
librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
View File

@ -28,8 +28,10 @@ object ScalaArtifacts {
Seq(ModuleID(org, DottyIDPrefix, version, Some(Configurations.ScalaTool.name + "->compile"), Seq(ModuleID(org, DottyIDPrefix, version, Some(Configurations.ScalaTool.name + "->compile"),
crossVersion = CrossVersion.binary)) crossVersion = CrossVersion.binary))
else else
Seq(scalaToolDependency(org, ScalaArtifacts.CompilerID, version), Seq(
scalaToolDependency(org, ScalaArtifacts.LibraryID, version)) scalaToolDependency(org, ScalaArtifacts.CompilerID, version),
scalaToolDependency(org, ScalaArtifacts.LibraryID, version)
)
private[this] def scalaToolDependency(org: String, id: String, version: String): ModuleID = private[this] def scalaToolDependency(org: String, id: String, version: String): ModuleID =
ModuleID(org, id, version, Some(Configurations.ScalaTool.name + "->default,optional(default)")) ModuleID(org, id, version, Some(Configurations.ScalaTool.name + "->default,optional(default)"))