diff --git a/ivy/src/main/scala/sbt/CompatibilityWarning.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala similarity index 87% rename from ivy/src/main/scala/sbt/CompatibilityWarning.scala rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala index ead6b517b..9bd00be7c 100644 --- a/ivy/src/main/scala/sbt/CompatibilityWarning.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala @@ -1,4 +1,7 @@ -package sbt +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 = { @@ -19,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)"))