diff --git a/core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala b/core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala index 85f5c387f..e7e087537 100644 --- a/core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala +++ b/core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala @@ -15,7 +15,7 @@ private[sbt] object JsonUtil { log: Logger ): UpdateReport = { try { - val lite = CacheStore(path).read[UpdateReportLite] + val lite = CacheStore(path).read[UpdateReportLite]() fromLite(lite, cachedDescriptor) } catch { case e: Throwable => diff --git a/core/src/main/scala/sbt/internal/librarymanagement/UpdateClassifiersUtil.scala b/core/src/main/scala/sbt/internal/librarymanagement/UpdateClassifiersUtil.scala index c01e781af..9f87ff5e8 100644 --- a/core/src/main/scala/sbt/internal/librarymanagement/UpdateClassifiersUtil.scala +++ b/core/src/main/scala/sbt/internal/librarymanagement/UpdateClassifiersUtil.scala @@ -35,7 +35,7 @@ object UpdateClassifiersUtil { classifiers: Vector[String], exclude: Map[ModuleID, Set[ConfigRef]] )(m: ModuleID): Option[ModuleID] = { - val excluded: Set[ConfigRef] = exclude getOrElse (restrictedCopy(m, false), Set.empty) + val excluded: Set[ConfigRef] = exclude.getOrElse(restrictedCopy(m, false), Set.empty) val exls = excluded map { _.name } val included = classifiers filterNot exls if (included.isEmpty) None diff --git a/core/src/main/scala/sbt/internal/librarymanagement/VersionRange.scala b/core/src/main/scala/sbt/internal/librarymanagement/VersionRange.scala index eed2eebb0..74c7ff253 100644 --- a/core/src/main/scala/sbt/internal/librarymanagement/VersionRange.scala +++ b/core/src/main/scala/sbt/internal/librarymanagement/VersionRange.scala @@ -18,7 +18,7 @@ object VersionRange { // See https://github.com/sbt/sbt/issues/2954 def stripMavenVersionRange(version: String): Option[String] = if (isVersionRange(version)) { - val noSpace = version.replaceAllLiterally(" ", "") + val noSpace = version.replace(" ", "") noSpace match { case MavenVersionSetPattern(open1, x1, comma, x2, close1, _) => // http://maven.apache.org/components/enforcer/enforcer-rules/versionRanges.html @@ -64,7 +64,7 @@ object VersionRange { val start = rev(0) val stop = rev(rev.length - 1) val mid = rev.substring(1, rev.length - 1) - (if (start == ']') "(" else start) + mid + (if (stop == '[') ")" else stop) + (if (start == ']') "(" else start.toString) + mid + (if (stop == '[') ")" else stop) case _ => revision } } catch { diff --git a/core/src/main/scala/sbt/librarymanagement/EvictionError.scala b/core/src/main/scala/sbt/librarymanagement/EvictionError.scala index 94a7f38e5..6d0d0c274 100644 --- a/core/src/main/scala/sbt/librarymanagement/EvictionError.scala +++ b/core/src/main/scala/sbt/librarymanagement/EvictionError.scala @@ -130,7 +130,7 @@ object EvictionError { ) } - implicit val evictionErrorLines: ShowLines[EvictionError] = ShowLines { a: EvictionError => + implicit val evictionErrorLines: ShowLines[EvictionError] = ShowLines { (a: EvictionError) => a.toLines } } diff --git a/core/src/main/scala/sbt/librarymanagement/EvictionWarning.scala b/core/src/main/scala/sbt/librarymanagement/EvictionWarning.scala index d646303e4..ae6c95638 100644 --- a/core/src/main/scala/sbt/librarymanagement/EvictionWarning.scala +++ b/core/src/main/scala/sbt/librarymanagement/EvictionWarning.scala @@ -208,7 +208,7 @@ final class EvictionPair private[sbt] ( } object EvictionPair { - implicit val evictionPairLines: ShowLines[EvictionPair] = ShowLines { a: EvictionPair => + implicit val evictionPairLines: ShowLines[EvictionPair] = ShowLines { (a: EvictionPair) => val revs = a.evicteds map { _.module.revision } val revsStr = if (revs.size <= 1) revs.mkString else "{" + revs.mkString(", ") + "}" val seen: mutable.Set[ModuleID] = mutable.Set() diff --git a/core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala b/core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala index c5191467c..cb68eaf78 100644 --- a/core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala @@ -59,7 +59,7 @@ private[librarymanagement] abstract class ModuleIDExtra { /** String representation of the extra attributes, excluding any information only attributes. */ def extraString: String = - extraDependencyAttributes.map { case (k, v) => k + "=" + v } mkString ("(", ", ", ")") + extraDependencyAttributes.map { case (k, v) => k + "=" + v }.mkString("(", ", ", ")") /** Returns the extra attributes except for ones marked as information only (ones that typically would not be used for dependency resolution). */ def extraDependencyAttributes: Map[String, String] = diff --git a/core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala b/core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala index 99017ba83..d871caa83 100644 --- a/core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala +++ b/core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala @@ -38,7 +38,7 @@ object UnresolvedWarning { } map { case (_, p) => p } - val failedPaths = err.failed map { x: ModuleID => + val failedPaths = err.failed map { (x: ModuleID) => err.failedPaths(x).toList.reverse map { id => (id, modulePosition(id)) } diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index cc381573e..e45a5fcf4 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -433,11 +433,11 @@ final class IvySbt( unionFormat2[IvyConfiguration, InlineIvyConfiguration, ExternalIvyConfiguration] object NullLogger extends sbt.internal.util.BasicLogger { - override def control(event: sbt.util.ControlEvent.Value, message: ⇒ String): Unit = () - override def log(level: Level.Value, message: ⇒ String): Unit = () + override def control(event: sbt.util.ControlEvent.Value, message: => String): Unit = () + override def log(level: Level.Value, message: => String): Unit = () override def logAll(events: Seq[sbt.util.LogEvent]): Unit = () - override def success(message: ⇒ String): Unit = () - override def trace(t: ⇒ Throwable): Unit = () + override def success(message: => String): Unit = () + override def trace(t: => Throwable): Unit = () } } diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index 41f82ab6d..6d223287c 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -396,7 +396,7 @@ object IvyActions { val toRetrieve: Option[Vector[ConfigRef]] = config.configurationsToRetrieve val base = getRetrieveDirectory(config.retrieveDirectory) val pattern = getRetrievePattern(config.outputPattern) - val existingFiles = PathFinder(base).allPaths.get filterNot { _.isDirectory } + val existingFiles = PathFinder(base).allPaths.get() filterNot { _.isDirectory } val toCopy = new collection.mutable.HashSet[(File, File)] val retReport = report retrieve { (conf: ConfigRef, mid, art, cached) => toRetrieve match { diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala index c3437b595..04b31adab 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala @@ -8,7 +8,7 @@ import scala.util.{ Failure, Success, Try } private[sbt] object IvyUtil { def separate[A, B](l: Seq[Either[A, B]]): (Seq[A], Seq[B]) = - (l.flatMap(_.left.toOption), l.flatMap(_.right.toOption)) + (l.flatMap(_.left.toOption), l.flatMap(_.toOption)) @tailrec final def retryWithBackoff[T]( diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala index d9cadfd81..7d94bca6d 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala @@ -61,7 +61,7 @@ private[sbt] class CachedResolutionResolveCache { val maxConflictCacheSize: Int = 1024 val maxUpdateReportCacheSize: Int = 1024 - def clean(): Unit = updateReportCache.clear + def clean(): Unit = updateReportCache.clear() def directDependencies(md0: ModuleDescriptor): Vector[DependencyDescriptor] = md0.getDependencies.toVector @@ -699,11 +699,11 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { ) } (if (n > guard) { - warnCircular + warnCircular() result0 } else if (called.isEmpty) result0 else if (notCalled.isEmpty) { - warnCircular + warnCircular() sortModules(cs.tail, acc, extra :+ cs.head, n + 1, guard) } else sortModules(called, acc ++ notCalled, extra, 0, called.size * called.size + 1)) } diff --git a/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala b/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala index ef2766480..458972409 100644 --- a/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala +++ b/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala @@ -92,7 +92,7 @@ final class DirectCredentials( val dq = '"' val r = if (realm == null) "null" - else dq + realm + dq + else s"$dq$realm$dq" s"""DirectCredentials($r, "$host", "$userName", ****)""" } } diff --git a/ivy/src/test/scala/sbt/internal/librarymanagement/BaseIvySpecification.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/BaseIvySpecification.scala index 304412069..f6bcba917 100644 --- a/ivy/src/test/scala/sbt/internal/librarymanagement/BaseIvySpecification.scala +++ b/ivy/src/test/scala/sbt/internal/librarymanagement/BaseIvySpecification.scala @@ -102,7 +102,7 @@ trait BaseIvySpecification extends AbstractEngineSpec { } } - def cleanCache: Unit = cleanIvyCache() + def cleanCache(): Unit = cleanIvyCache() def cleanIvyCache(): Unit = IO.delete(currentTarget / "cache") override def cleanCachedResolutionCache(module: ModuleDescriptor): Unit = { diff --git a/ivy/src/test/scala/sbt/internal/librarymanagement/ManagedChecksumsSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/ManagedChecksumsSpec.scala index e9e133d4c..b49c34b75 100644 --- a/ivy/src/test/scala/sbt/internal/librarymanagement/ManagedChecksumsSpec.scala +++ b/ivy/src/test/scala/sbt/internal/librarymanagement/ManagedChecksumsSpec.scala @@ -1,7 +1,5 @@ package sbt.internal.librarymanagement -import java.io.File - import org.apache.ivy.util.Message import sbt.librarymanagement._ import sbt.librarymanagement.ivy._