Merge pull request #160 from dwijnand/scalafmt

Scalafmt 1.2.0

build.sbt

@@ -46,7 +46,7 @@ lazy val lmRoot = (project in file("."))
         },
         bintrayPackage := "librarymanagement",
         scalafmtOnCompile := true,
-        scalafmtVersion := "1.1.0",
+        scalafmtVersion := "1.2.0",
         git.baseVersion := baseVersion,
         version := {
           val v = version.value

core/src/main/scala/sbt/librarymanagement/MakePomConfiguration.scala

@@ -77,7 +77,9 @@ final class MakePomConfiguration private (val file: Option[File],
   def withProcess(process: XNode => XNode): MakePomConfiguration = {
     copy(process = process)
   }
-  def withFilterRepositories(filterRepositories: MavenRepository => Boolean): MakePomConfiguration = {
+  def withFilterRepositories(
+      filterRepositories: MavenRepository => Boolean
+  ): MakePomConfiguration = {
     copy(filterRepositories = filterRepositories)
   }
   def withAllRepositories(allRepositories: Boolean): MakePomConfiguration = {

ivy/src/main/scala/sbt/internal/librarymanagement/FakeResolver.scala

@@ -104,7 +104,10 @@ private[sbt] class FakeResolver(private var name: String, cacheDir: File, module
   // we can't find the module descriptor.
   override def findIvyFileRef(dd: DependencyDescriptor, data: ResolveData): ResolvedResource = null
 
-  override def getDependency(dd: DependencyDescriptor, data: ResolveData): ResolvedModuleRevision = {
+  override def getDependency(
+      dd: DependencyDescriptor,
+      data: ResolveData
+  ): ResolvedModuleRevision = {
 
     val Artifact(organisation, name, revision) = dd
     val mrid = dd.getDependencyRevisionId()

ivy/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala

@@ -40,7 +40,12 @@ class IvyCache(val ivyHome: Option[File]) {
   def lockFile = new File(ivyHome getOrElse Path.userHome, ".sbt.cache.lock")
 
   /** Caches the given 'file' with the given ID.  It may be retrieved or cleared using this ID.*/
-  def cacheJar(moduleID: ModuleID, file: File, lock: Option[xsbti.GlobalLock], log: Logger): Unit = {
+  def cacheJar(
+      moduleID: ModuleID,
+      file: File,
+      lock: Option[xsbti.GlobalLock],
+      log: Logger
+  ): Unit = {
     val artifact = defaultArtifact(moduleID)
     val resolved =
       new ResolvedResource(new FileResource(new IvyFileRepository, file), moduleID.revision)

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/MergeDescriptors.scala

@@ -121,7 +121,9 @@ private[sbt] final case class MergedDescriptors(a: DependencyDescriptor, b: Depe
       case _ => art
     }
   }
-  private[this] def defaultArtifact(a: DependencyDescriptor): Array[DependencyArtifactDescriptor] = {
+  private[this] def defaultArtifact(
+      a: DependencyDescriptor
+  ): Array[DependencyArtifactDescriptor] = {
     val dd = new DefaultDependencyArtifactDescriptor(
       a,
       a.getDependencyRevisionId.getName,

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala

@@ -81,7 +81,10 @@ private[sbt] case class SbtChainResolver(
   override def locate(artifact: IArtifact): ArtifactOrigin =
     if (IvySbt.hasImplicitClassifier(artifact)) null else super.locate(artifact)
 
-  override def getDependency(dd: DependencyDescriptor, data: ResolveData): ResolvedModuleRevision = {
+  override def getDependency(
+      dd: DependencyDescriptor,
+      data: ResolveData
+  ): ResolvedModuleRevision = {
     if (data.getOptions.getLog != LogOptions.LOG_QUIET)
       Message.debug("Resolving " + dd.getDependencyRevisionId + " ...")
     val gd = CustomSbtResolution.getDependency(dd, data)