From d693d0cde9207c0af82edc0f353dbc729df92e3c Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 17 Jan 2016 19:58:57 +0000 Subject: [PATCH 1/3] Move CompatibilityWarning to sbt.internal.librarymanagement --- .../sbt/internal/librarymanagement}/CompatibilityWarning.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {ivy/src/main/scala/sbt => librarymanagement/src/main/scala/sbt/internal/librarymanagement}/CompatibilityWarning.scala (96%) diff --git a/ivy/src/main/scala/sbt/CompatibilityWarning.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala similarity index 96% rename from ivy/src/main/scala/sbt/CompatibilityWarning.scala rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala index ead6b517b..aa290c2a2 100644 --- a/ivy/src/main/scala/sbt/CompatibilityWarning.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.internal.librarymanagement private[sbt] object CompatibilityWarning { def apply(module: IvySbt#Module, mavenStyle: Boolean, log: Logger): Unit = { From 0a8402a8a9a8b8f64d85f6d26f4ef0a39631cd5e Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 17 Jan 2016 21:12:27 +0000 Subject: [PATCH 2/3] Add missing imports --- .../sbt/internal/librarymanagement/CompatibilityWarning.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala index aa290c2a2..985b4bfbd 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala @@ -1,5 +1,8 @@ package sbt.internal.librarymanagement +import sbt.librarymanagement._ +import sbt.util.Logger + private[sbt] object CompatibilityWarning { def apply(module: IvySbt#Module, mavenStyle: Boolean, log: Logger): Unit = { if (mavenStyle) { From ffcec2fa35ae7990546e02e7840b75e1359aae74 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 17 Jan 2016 21:12:36 +0000 Subject: [PATCH 3/3] Commit auto-formatted code --- .../internal/librarymanagement/CompatibilityWarning.scala | 3 ++- .../src/main/scala/sbt/librarymanagement/IvyScala.scala | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala index 985b4bfbd..9bd00be7c 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala @@ -22,7 +22,8 @@ private[sbt] object CompatibilityWarning { s"""Found intransitive dependency ($m) while publishMavenStyle is true, but Maven repositories | do not support intransitive dependencies. Use exclusions instead so transitive dependencies | will be correctly excluded in dependent projects. - """.stripMargin) + """.stripMargin + ) } else () } } diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala index b12f5d27e..e5808eef9 100644 --- a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala +++ b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala @@ -28,8 +28,10 @@ object ScalaArtifacts { Seq(ModuleID(org, DottyIDPrefix, version, Some(Configurations.ScalaTool.name + "->compile"), crossVersion = CrossVersion.binary)) else - Seq(scalaToolDependency(org, ScalaArtifacts.CompilerID, version), - scalaToolDependency(org, ScalaArtifacts.LibraryID, version)) + Seq( + scalaToolDependency(org, ScalaArtifacts.CompilerID, version), + scalaToolDependency(org, ScalaArtifacts.LibraryID, version) + ) private[this] def scalaToolDependency(org: String, id: String, version: String): ModuleID = ModuleID(org, id, version, Some(Configurations.ScalaTool.name + "->default,optional(default)"))