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

fix Scala 2.13 warnings

This commit is contained in:
xuwei-k 2021-11-14 22:59:34 +09:00
parent fe02f99a74
commit 535b15b83e
51 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -1104,7 +1104,7 @@ lazy val serverTestProj = (project in file("server-test"))
val rawClasspath =
(Compile / fullClasspathAsJars).value.map(_.data).mkString(java.io.File.pathSeparator)
val cp =
if (scala.util.Properties.isWin) rawClasspath.replaceAllLiterally("\\", "\\\\")
if (scala.util.Properties.isWin) rawClasspath.replace("\\", "\\\\")
else rawClasspath
val content = {
s"""|

2
internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
View File

@ -30,7 +30,7 @@ final case class HCons[H, T <: HList](head: H, tail: T) extends HList {
type Wrap[M[_]] = M[H] :+: T#Wrap[M]
def :+:[G](g: G): G :+: H :+: T = HCons(g, this)
override def toString = head + " :+: " + tail.toString
override def toString = head.toString + " :+: " + tail.toString
}
object HList {

15
internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala
View File

@ -43,7 +43,7 @@ private final class Settings0[ScopeType](
(data get scope).flatMap(_ get key)
def set[T](scope: ScopeType, key: AttributeKey[T], value: T): Settings[ScopeType] = {
val map = data getOrElse (scope, AttributeMap.empty)
val map = data.getOrElse(scope, AttributeMap.empty)
val newData = data.updated(scope, map.put(key, value))
new Settings0(newData, delegates)
}
@ -476,7 +476,7 @@ trait Init[ScopeType] {
if (posDefined.size == settings.size) "defined at:"
else
"some of the defining occurrences:"
header + (posDefined.distinct mkString ("\n\t", "\n\t", "\n"))
header + (posDefined.distinct.mkString("\n\t", "\n\t", "\n"))
} else ""
}
@ -711,10 +711,10 @@ trait Init[ScopeType] {
def mapReferenced(g: MapScoped): Setting[T] = make(key, init mapReferenced g, pos)
def validateReferenced(g: ValidateRef): Either[Seq[Undefined], Setting[T]] =
(init validateReferenced g).right.map(newI => make(key, newI, pos))
(init validateReferenced g).map(newI => make(key, newI, pos))
private[sbt] def validateKeyReferenced(g: ValidateKeyRef): Either[Seq[Undefined], Setting[T]] =
(init validateKeyReferenced g).right.map(newI => make(key, newI, pos))
(init validateKeyReferenced g).map(newI => make(key, newI, pos))
def mapKey(g: MapScoped): Setting[T] = make(g(key), init, pos)
def mapInit(f: (ScopedKey[T], T) => T): Setting[T] = make(key, init(t => f(key, t)), pos)
@ -879,9 +879,8 @@ trait Init[ScopeType] {
def evaluate(ss: Settings[ScopeType]): T = f(in evaluate ss) evaluate ss
def mapReferenced(g: MapScoped) = new Bind[S, T](s => f(s) mapReferenced g, in mapReferenced g)
def validateKeyReferenced(g: ValidateKeyRef) = (in validateKeyReferenced g).right.map {
validIn =>
new Bind[S, T](s => handleUndefined(f(s) validateKeyReferenced g), validIn)
def validateKeyReferenced(g: ValidateKeyRef) = (in validateKeyReferenced g).map { validIn =>
new Bind[S, T](s => handleUndefined(f(s) validateKeyReferenced g), validIn)
}
def mapConstant(g: MapConstant) = new Bind[S, T](s => f(s) mapConstant g, in mapConstant g)
@ -898,7 +897,7 @@ trait Init[ScopeType] {
def validateKeyReferenced(g: ValidateKeyRef) = a match {
case None => Right(this)
case Some(i) => Right(new Optional(i.validateKeyReferenced(g).right.toOption, f))
case Some(i) => Right(new Optional(i.validateKeyReferenced(g).toOption, f))
}
def mapConstant(g: MapConstant): Initialize[T] = new Optional(a map mapConstantT(g).fn, f)

2
internal/util-collection/src/main/scala/sbt/internal/util/Util.scala
View File

@ -43,7 +43,7 @@ object Util {
def camelToHyphen(s: String): String =
Camel.replaceAllIn(s, m => m.group(1) + "-" + m.group(2).toLowerCase(Locale.ENGLISH))
def quoteIfKeyword(s: String): String = if (ScalaKeywords.values(s)) '`' + s + '`' else s
def quoteIfKeyword(s: String): String = if (ScalaKeywords.values(s)) s"`${s}`" else s
def ignoreResult[T](f: => T): Unit = macro Macro.ignore

2
internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala
View File

@ -909,7 +909,7 @@ private final class StringLiteral(str: String, start: Int) extends ValidParser[S
if (str.charAt(start) == c) stringLiteral(str, start + 1) else new Invalid(resultEmpty)
def completions(level: Int) = Completions.single(Completion.suggestion(str.substring(start)))
override def toString = '"' + str + '"'
override def toString = "\"" + str + "\""
}
private final class CharacterClass(f: Char => Boolean, label: String) extends ValidParser[Char] {

4
internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
View File

@ -238,12 +238,12 @@ trait Parsers {
val notDelim = charClass(c => c != open && c != close).*.string
def impl(): Parser[String] = {
(open ~ (notDelim ~ close).?).flatMap {
case (l, Some((content, r))) => Parser.success(l + content + r)
case (l, Some((content, r))) => Parser.success(s"$l$content$r")
case (l, None) =>
((notDelim ~ impl()).map {
case (leftPrefix, nestedBraces) => leftPrefix + nestedBraces
}.+ ~ notDelim ~ close).map {
case ((nested, suffix), r) => l + nested.mkString + suffix + r
case ((nested, suffix), r) => s"$l${nested.mkString}$suffix$r"
}
}
}

2
internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala
View File

@ -83,7 +83,7 @@ object GlobalLogging {
): GlobalLogging = {
val loggerName = generateName
val log = LoggerContext.globalContext.logger(loggerName, None, None)
val appender = ConsoleAppender(ConsoleAppender.generateName, console)
val appender = ConsoleAppender(ConsoleAppender.generateName(), console)
LoggerContext.globalContext.addAppender(loggerName, appender -> Level.Info)
GlobalLogging(log, console, appender, GlobalLogBacking(newBackingFile), newAppender)
}

6
internal/util-logging/src/main/scala/sbt/internal/util/MainAppender.scala
View File

@ -67,14 +67,14 @@ object MainAppender {
)
def defaultScreen(console: ConsoleOut): Appender =
ConsoleAppender(ConsoleAppender.generateName, console)
ConsoleAppender(ConsoleAppender.generateName(), console)
def defaultScreen(
console: ConsoleOut,
suppressedMessage: SuppressedTraceContext => Option[String]
): Appender = {
ConsoleAppender(
ConsoleAppender.generateName,
ConsoleAppender.generateName(),
console,
suppressedMessage = suppressedMessage
)
@ -99,7 +99,7 @@ object MainAppender {
def defaultBacked(loggerName: String, useFormat: Boolean): PrintWriter => Appender =
to => {
ConsoleAppender(
ConsoleAppender.generateName,
ConsoleAppender.generateName(),
ConsoleOut.printWriterOut(to),
useFormat = useFormat
)

4
internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala
View File

@ -99,8 +99,8 @@ private[sbt] final class ProgressState(
addBytes(terminal, bytes)
val toWrite = new ArrayBuffer[Byte]
terminal.prompt match {
case a: Prompt.AskUser if a.render.nonEmpty && canClearPrompt => toWrite ++= cleanPrompt
case _ =>
case a: Prompt.AskUser if a.render().nonEmpty && canClearPrompt => toWrite ++= cleanPrompt
case _ =>
}
val endsWithNewLine = bytes.endsWith(lineSeparatorBytes)
if (endsWithNewLine || bytes.containsSlice(lineSeparatorBytes)) {

2
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -905,7 +905,7 @@ object Terminal {
new AtomicReference[((Int, Int), Deadline)](((1, 1), Deadline.now - 1.day))
private[this] def setSize() = size.set((Try(getSizeImpl).getOrElse((1, 1)), Deadline.now))
private[this] def getSize = size.get match {
case (s, d) if (d + sizeRefreshPeriod).isOverdue =>
case (s, d) if (d + sizeRefreshPeriod).isOverdue() =>
setSize()
size.get._1
case (s, _) => s

2
internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala
View File

@ -56,7 +56,7 @@ private[util] class WindowsInputStream(term: org.jline.terminal.Terminal, in: In
private val SHIFT_PRESSED = 0x0010;
private def getCapability(cap: Capability): String = term.getStringCapability(cap) match {
case null => null
case c => c.replaceAllLiterally("\\E", "\u001B")
case c => c.replace("\\E", "\u001B")
}
/*
* This function is a hybrid of jline 2 WindowsTerminal.readConsoleInput

2
internal/util-logging/src/test/scala/Escapes.scala
View File

@ -96,7 +96,7 @@ object Escapes extends Properties("Escapes") {
)
}
assert(isEscapeTerminator(terminator))
def makeString: String = ESC + content + terminator
def makeString: String = s"$ESC$content$terminator"
override def toString =
if (content.isEmpty) s"ESC (${terminator.toInt})"

2
internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
View File

@ -214,5 +214,5 @@ private final class MRelation[A, B](fwd: Map[A, Set[B]], rev: Map[B, Set[A]])
override def hashCode = fwd.filterNot(_._2.isEmpty).hashCode()
override def toString =
all.map { case (a, b) => a + " -> " + b }.mkString("Relation [", ", ", "]")
all.map { case (a, b) => s"$a -> $b" }.mkString("Relation [", ", ", "]")
}

9
internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
View File

@ -13,7 +13,6 @@ import java.io.File
import sbt.io.{ IO, Path }
import sbt.io.syntax._
import Path._
import sbt.io.IO
class FileCommands(baseDirectory: File) extends BasicStatementHandler {
lazy val commands = commandMap
@ -25,7 +24,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
"mkdir" nonEmpty makeDirectories _,
"absent" nonEmpty absent _,
// "sync" twoArg("Two directory paths", sync _),
"newer" twoArg ("Two paths", newer _),
"newer".twoArg("Two paths", newer _),
"pause" noArg {
println("Pausing in " + baseDirectory)
/*readLine("Press enter to continue. ") */
@ -33,11 +32,11 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
System.console.readLine
println()
},
"sleep" oneArg ("Time in milliseconds", time => Thread.sleep(time.toLong)),
"sleep".oneArg("Time in milliseconds", time => Thread.sleep(time.toLong)),
"exec" nonEmpty (execute _),
"copy" copy (to => rebase(baseDirectory, to)),
"copy-file" twoArg ("Two paths", copyFile _),
"must-mirror" twoArg ("Two paths", diffFiles _),
"copy-file".twoArg("Two paths", copyFile _),
"must-mirror".twoArg("Two paths", diffFiles _),
"copy-flat" copy flat
)

2
internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala
View File

@ -103,7 +103,7 @@ final class ScriptedTests(
log: ManagedLogger,
context: LoggerContext,
): Seq[() => Option[String]] = {
for (groupDir <- (resourceBaseDirectory * group).get; nme <- (groupDir * name).get) yield {
for (groupDir <- (resourceBaseDirectory * group).get(); nme <- (groupDir * name).get()) yield {
val g = groupDir.getName
val n = nme.getName
val str = s"$g / $n"

2
launcher-package/build.sbt
View File

@ -273,7 +273,7 @@ val root = (project in file(".")).
case (k, BinSbt) =>
import java.nio.file.{Files, FileSystems}
val x = IO.read(k)
IO.write(t / "sbt", x.replaceAllLiterally(
IO.write(t / "sbt", x.replace(
"declare init_sbt_version=_to_be_replaced",
s"declare init_sbt_version=$sbtVersionToRelease"))

4
main-actions/src/main/scala/sbt/ForkTests.scala
View File

@ -162,7 +162,7 @@ private[sbt] object ForkTests {
RunningProcesses.add(p)
val ec = try p.exitValue()
finally {
if (p.isAlive) p.destroy()
if (p.isAlive()) p.destroy()
RunningProcesses.remove(p)
}
val result =
@ -223,7 +223,7 @@ private final class React(
listeners.foreach(_ testEvent event)
val suiteResult = SuiteResult(tEvents)
results += group -> suiteResult
listeners.foreach(_ endGroup (group, suiteResult.result))
listeners.foreach(_.endGroup(group, suiteResult.result))
react()
}
}

2
main-actions/src/main/scala/sbt/Package.scala
View File

@ -88,7 +88,7 @@ object Package {
for ((key, value) <- mergeManifest.getEntries.asScala) {
entryMap.get(key) match {
case Some(attributes) => mergeAttributes(attributes, value); ()
case None => entryMap put (key, value); ()
case None => entryMap.put(key, value); ()
}
}
}

2
main-actions/src/main/scala/sbt/RawCompileLike.scala
View File

@ -65,7 +65,7 @@ object RawCompileLike {
log.debug("Uptodate: " + outputDirectory.getAbsolutePath)
}
}
cachedComp(inputs)(exists(outputDirectory.allPaths.get.toSet))
cachedComp(inputs)(exists(outputDirectory.allPaths.get().toSet))
}
def prepare(description: String, doCompile: Gen): Gen =

2
main-actions/src/main/scala/sbt/compiler/Eval.scala
View File

@ -265,7 +265,7 @@ final class Eval(
if (phase == null || phase == phase.next || evalReporter.hasErrors)
()
else {
enteringPhase(phase) { phase.run }
enteringPhase(phase) { phase.run() }
compile(phase.next)
}
}

2
main-actions/src/test/scala/sbt/CacheIvyTest.scala
View File

@ -85,7 +85,7 @@ class CacheIvyTest extends Properties("CacheIvy") {
for {
o <- Gen.identifier
n <- Gen.identifier
r <- for { n <- Gen.numChar; ns <- Gen.numStr } yield n + ns
r <- for { n <- Gen.numChar; ns <- Gen.numStr } yield s"$n$ns"
cs <- arbitrary[Option[String]]
branch <- arbitrary[Option[String]]
isChanging <- arbitrary[Boolean]

4
main-command/src/main/scala/sbt/BasicCommands.scala
View File

@ -153,7 +153,7 @@ object BasicCommands {
private[this] def completionsParser: Parser[String] = {
val notQuoted = (NotQuoted ~ any.*) map { case (nq, s) => nq + s }
val quotedOrUnquotedSingleArgument = Space ~> (StringVerbatim | StringEscapable | notQuoted)
token(quotedOrUnquotedSingleArgument ?? "" examples ("", " "))
token((quotedOrUnquotedSingleArgument ?? "").examples("", " "))
}
def runCompletions(state: State)(input: String): State = {
@ -199,7 +199,7 @@ object BasicCommands {
val it = s.iterator
var fail = false
while (it.hasNext && !fail) {
it.next match {
it.next() match {
case "" => fail = it.hasNext; ()
case next => result += next; ()
}

4
main-command/src/main/scala/sbt/CommandUtil.scala
View File

@ -88,10 +88,10 @@ object CommandUtil {
}
def layoutDetails(details: Map[String, String]): String =
details.map { case (k, v) => k + "\n\n " + v } mkString ("\n", "\n\n", "\n")
details.map { case (k, v) => k + "\n\n " + v }.mkString("\n", "\n\n", "\n")
final val HelpPatternFlags = Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
private[sbt] def isSbtBuild(baseDir: File) =
(baseDir / "project").exists() || (baseDir * "*.sbt").get.nonEmpty
(baseDir / "project").exists() || (baseDir * "*.sbt").get().nonEmpty
}

4
main-command/src/main/scala/sbt/internal/LegacyWatched.scala
View File

@ -44,7 +44,7 @@ private[sbt] object LegacyWatched {
(ClearOnFailure :: next :: FailureWall :: repeat :: s)
.put(ContinuousEventMonitor, monitor: EventMonitor)
case Some(eventMonitor) =>
Watched.printIfDefined(watched watchingMessage eventMonitor.state)
Watched.printIfDefined(watched watchingMessage eventMonitor.state())
@tailrec def impl(): State = {
val triggered = try eventMonitor.awaitEvent()
catch {
@ -56,7 +56,7 @@ private[sbt] object LegacyWatched {
false
}
if (triggered) {
Watched.printIfDefined(watched triggeredMessage eventMonitor.state)
Watched.printIfDefined(watched triggeredMessage eventMonitor.state())
ClearOnFailure :: next :: FailureWall :: repeat :: s
} else if (shouldTerminate) {
while (System.in.available() > 0) System.in.read()

16
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
View File

@ -380,7 +380,7 @@ class NetworkClient(
}
if (!startServer) {
val deadline = 5.seconds.fromNow
while (socket.isEmpty && !deadline.isOverdue) {
while (socket.isEmpty && !deadline.isOverdue()) {
socket = Try(ClientSocket.localSocket(bootSocketName, useJNI)).toOption
if (socket.isEmpty) Thread.sleep(20)
}
@ -836,12 +836,12 @@ class NetworkClient(
case -1 => (query, query, None, None) // shouldn't happen
case i =>
val rawPrefix = query.substring(0, i)
val prefix = rawPrefix.replaceAllLiterally("\"", "").replaceAllLiterally("\\;", ";")
val rawSuffix = query.substring(i).replaceAllLiterally("\\;", ";")
val prefix = rawPrefix.replace("\"", "").replace("\\;", ";")
val rawSuffix = query.substring(i).replace("\\;", ";")
val suffix = if (rawSuffix.length > 1) rawSuffix.substring(1) else ""
(rawPrefix, prefix, Some(rawSuffix), Some(suffix))
}
} else (query, query.replaceAllLiterally("\\;", ";"), None, None)
} else (query, query.replace("\\;", ";"), None, None)
val tailSpace = query.endsWith(" ") || query.endsWith("\"")
val sanitizedQuery = suffix.foldLeft(prefix) { _ + _ }
def getCompletions(query: String, sendCommand: Boolean): Seq[String] = {
@ -885,7 +885,7 @@ class NetworkClient(
}
getCompletions(sanitizedQuery, true) collect {
case c if inQuote => c
case c if tailSpace && c.contains(" ") => c.replaceAllLiterally(prefix, "")
case c if tailSpace && c.contains(" ") => c.replace(prefix, "")
case c if !tailSpace => c.split(" ").last
}
}
@ -1106,10 +1106,10 @@ object NetworkClient {
launchJar = a
.split("--sbt-launch-jar=")
.lastOption
.map(_.replaceAllLiterally("%20", " "))
.map(_.replace("%20", " "))
case "--sbt-launch-jar" if i + 1 < sanitized.length =>
i += 1
launchJar = Option(sanitized(i).replaceAllLiterally("%20", " "))
launchJar = Option(sanitized(i).replace("%20", " "))
case "-bsp" | "--bsp" => bsp = true
case a if !a.startsWith("-") => commandArgs += a
case a @ SysProp(key, value) =>
@ -1131,7 +1131,7 @@ object NetworkClient {
sbtArguments.toSeq,
commandArgs.toSeq,
completionArguments.toSeq,
sbtScript.getOrElse(defaultSbtScript).replaceAllLiterally("%20", " "),
sbtScript.getOrElse(defaultSbtScript).replace("%20", " "),
bsp,
launchJar
)

4
main-command/src/main/scala/sbt/internal/client/ServerConnection.scala
View File

@ -79,7 +79,7 @@ abstract class ServerConnection(connection: Socket) {
if (a.nonEmpty) {
out.write(a)
}
writeEndLine
writeEndLine()
} catch {
case e: IOException =>
shutdown()
@ -100,7 +100,7 @@ abstract class ServerConnection(connection: Socket) {
out.close()
connection.close()
} catch { case e: IOException => e.printStackTrace() }
onShutdown
onShutdown()
}
}

2
main-command/src/main/scala/sbt/internal/util/JoinThread.scala
View File

@ -20,7 +20,7 @@ object JoinThread {
t.interrupt()
t.join(10)
} catch { case e: InterruptedException => }
if (t.isAlive && !deadline.isOverdue) impl()
if (t.isAlive && !deadline.isOverdue()) impl()
}
impl()
if (t.isAlive) {

2
main-settings/src/main/scala/sbt/Def.scala
View File

@ -252,7 +252,7 @@ object Def extends Init[Scope] with TaskMacroExtra with InitializeImplicits {
)(l: Def.Initialize[Task[A => C]])(r: Def.Initialize[Task[B => C]]): Def.Initialize[Task[C]] = {
val lhs = {
val innerLhs: Def.Initialize[Task[Either[A, Either[B, C]]]] =
x.map((fab: Either[A, B]) => fab.right.map(Left(_)))
x.map((fab: Either[A, B]) => fab.map(Left(_)))
val innerRhs: Def.Initialize[Task[A => Either[B, C]]] =
l.map((fn: A => C) => fn.andThen(Right(_)))
selectITask(innerLhs, innerRhs)

2
main-settings/src/test/scala/sbt/std/UsageTest.scala
View File

@ -69,7 +69,7 @@ object Assign {
val is = Seq(
mk := 3,
name := "asdf",
tk := (math.random * 1000).toInt,
tk := (math.random() * 1000).toInt,
isk := dummys.value.parsed // should not compile: cannot use a task to define the parser
// ik := { if( tsk.parsed.value == "blue") tk.value else mk.value }
)

3
main/src/main/scala/sbt/BuildPaths.scala
View File

@ -116,7 +116,8 @@ object BuildPaths {
private[this] def defaultGlobalZinc(globalBase: File) = globalBase / "zinc"
def configurationSources(base: File): Seq[File] =
(base * (GlobFilter("*.sbt") - ".sbt")).get
(base * (GlobFilter("*.sbt") - ".sbt"))
.get()
.sortBy(_.getName.toLowerCase(Locale.ENGLISH))
def pluginDirectory(definitionBase: File) = definitionBase / PluginsDirectoryName

12
main/src/main/scala/sbt/Defaults.scala
View File

@ -3197,8 +3197,8 @@ object Classpaths {
update / unresolvedWarningConfiguration := UnresolvedWarningConfiguration(
dependencyPositions.value
),
updateFull := (updateTask tag (Tags.Update, Tags.Network)).value,
update := (updateWithoutDetails("update") tag (Tags.Update, Tags.Network)).value,
updateFull := (updateTask.tag(Tags.Update, Tags.Network)).value,
update := (updateWithoutDetails("update").tag(Tags.Update, Tags.Network)).value,
update := {
val report = update.value
val log = streams.value.log
@ -3209,7 +3209,7 @@ object Classpaths {
evicted / evictionWarningOptions := EvictionWarningOptions.full,
evicted := {
import ShowLines._
val report = (updateTask tag (Tags.Update, Tags.Network)).value
val report = (updateTask.tag(Tags.Update, Tags.Network)).value
val log = streams.value.log
val ew =
EvictionWarning(ivyModule.value, (evicted / evictionWarningOptions).value, report)
@ -3701,7 +3701,7 @@ object Classpaths {
try {
val extracted = (Project extract st)
val sk = (projRef / Zero / Zero / libraryDependencies).scopedKey
val empty = extracted.structure.data set (sk.scope, sk.key, Nil)
val empty = extracted.structure.data.set(sk.scope, sk.key, Nil)
val settings = extracted.structure.settings filter { s: Setting[_] =>
(s.key.key == libraryDependencies.key) &&
(s.key.scope.project == Select(projRef))
@ -4318,7 +4318,7 @@ trait BuildExtra extends BuildCommon with DefExtra {
/** Constructs a setting that declares a new artifact `a` that is generated by `taskDef`. */
def addArtifact(a: Artifact, taskDef: TaskKey[File]): SettingsDefinition = {
val pkgd = packagedArtifacts := packagedArtifacts.value updated (a, taskDef.value)
val pkgd = packagedArtifacts := packagedArtifacts.value.updated(a, taskDef.value)
Seq(artifacts += a, pkgd)
}
@ -4330,7 +4330,7 @@ trait BuildExtra extends BuildCommon with DefExtra {
val artLocal = SettingKey.local[Artifact]
val taskLocal = TaskKey.local[File]
val art = artifacts := artLocal.value +: artifacts.value
val pkgd = packagedArtifacts := packagedArtifacts.value updated (artLocal.value, taskLocal.value)
val pkgd = packagedArtifacts := packagedArtifacts.value.updated(artLocal.value, taskLocal.value)
Seq(artLocal := artifact.value, taskLocal := taskDef.value, art, pkgd)
}

4
main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
View File

@ -80,10 +80,10 @@ object CoursierRepositoriesTasks {
result1 map {
case r: FileRepository =>
val ivyPatterns = r.patterns.ivyPatterns map {
_.replaceAllLiterally("$" + "{ivy.home}", ivyHomeUri)
_.replace("$" + "{ivy.home}", ivyHomeUri)
}
val artifactPatterns = r.patterns.artifactPatterns map {
_.replaceAllLiterally("$" + "{ivy.home}", ivyHomeUri)
_.replace("$" + "{ivy.home}", ivyHomeUri)
}
val p =
r.patterns.withIvyPatterns(ivyPatterns).withArtifactPatterns(artifactPatterns)

3
main/src/main/scala/sbt/internal/BuildStructure.scala
View File

@ -263,7 +263,8 @@ final class BuildUnit(
val plugins: LoadedPlugins
) {
override def toString =
if (uri.getScheme == "file") localBase.toString else (uri + " (locally: " + localBase + ")")
if (uri.getScheme == "file") localBase.toString
else (uri.toString + " (locally: " + localBase + ")")
}
final class LoadedBuild(val root: URI, val units: Map[URI, LoadedBuildUnit]) {

2
main/src/main/scala/sbt/internal/InstallSbtn.scala
View File

@ -25,7 +25,7 @@ private[sbt] object InstallSbtn {
Def.inputKey[Unit]("install sbtn and tab completions").withRank(KeyRanks.BTask)
private[sbt] def installSbtnImpl: Def.Initialize[InputTask[Unit]] = Def.inputTask {
val inputVersion = Def.spaceDelimited("version").parsed.headOption
val version = inputVersion.getOrElse(sbtVersion.value.replaceAllLiterally("-SNAPSHOT", ""))
val version = inputVersion.getOrElse(sbtVersion.value.replace("-SNAPSHOT", ""))
val term = terminal.value
term.setMode(canonical = false, echo = false)
val baseDirectory = BuildPaths.getGlobalBase(state.value).toPath

2
main/src/main/scala/sbt/internal/graph/rendering/DagreHTML.scala
View File

@ -25,7 +25,7 @@ object DagreHTML {
val graphString =
URLEncoder
.encode(dotGraph, "utf8")
.replaceAllLiterally("+", "%20")
.replace("+", "%20")
IO.write(
new File(targetDirectory, "dependencies.dot.js"),

2
main/src/test/scala/ParseKey.scala
View File

@ -173,7 +173,7 @@ object ParseKey extends Properties {
.log(s"Key: ${Scope.displayPedantic(key.scope, key.key.label)}")
.log(s"Mask: $mask")
.log(s"Key string: '$s'")
.log(s"Parsed: ${parsed.right.map(displayFull)}")
.log(s"Parsed: ${parsed.map(displayFull)}")
.log(s"Structure: $structure")
)
}

2
main/src/test/scala/sbt/internal/InstallSbtnSpec.scala
View File

@ -41,7 +41,7 @@ class InstallSbtnSpec extends FlatSpec {
val tmpDir = Files.createTempDirectory("sbtn-test").toRealPath()
Files.createDirectories(tmpDir.resolve("project"))
val foo = tmpDir.resolve("foo")
val fooPath = foo.toString.replaceAllLiterally("\\", "\\\\")
val fooPath = foo.toString.replace("\\", "\\\\")
val build = s"""TaskKey[Unit]("foo") := IO.write(file("$fooPath"), "foo")"""
IO.write(tmpDir.resolve("build.sbt").toFile, build)
IO.write(

2
main/src/test/scala/sbt/internal/StressGCMonitor.scala
View File

@ -19,7 +19,7 @@ object StressGCMonitor {
new GCMonitor(ConsoleLogger())
val deadline = Deadline.now + 10.seconds
while (!deadline.isOverdue()) {
println(deadline.timeLeft.toSeconds + " seconds left...")
println(s"${deadline.timeLeft.toSeconds} seconds left...")
list = List.fill(1000 * 1000 * 100)(Random.nextInt(100))
System.gc()
Thread.sleep(10)

2
main/src/test/scala/sbt/internal/TestBuild.scala
View File

@ -51,7 +51,7 @@ abstract class TestBuild {
def tGen = genTasks(kebabIdGen, MaxDepsGen, MaxTasksGen)
class TestKeys(val env: Env, val scopes: Seq[Scope]) {
override def toString = env + "\n" + scopes.mkString("Scopes:\n\t", "\n\t", "")
override def toString = env.toString + "\n" + scopes.mkString("Scopes:\n\t", "\n\t", "")
lazy val delegated = scopes map env.delegates
}

4
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
View File

@ -39,7 +39,7 @@ object BuildServerConnection {
val sbtLaunchJar = classPath
.split(File.pathSeparator)
.find(jar => SbtLaunchJar.findFirstIn(jar).nonEmpty)
.map(_.replaceAllLiterally(" ", "%20"))
.map(_.replace(" ", "%20"))
.map(jar => s"--sbt-launch-jar=$jar")
val argv =
@ -66,6 +66,6 @@ object BuildServerConnection {
allPaths
.map(_.resolve(fileName))
.find(file => Files.exists(file) && Files.isExecutable(file))
.map(_.toString.replaceAllLiterally(" ", "%20"))
.map(_.toString.replace(" ", "%20"))
}
}

4
tasks-standard/src/main/scala/sbt/std/TaskExtra.scala
View File

@ -200,7 +200,7 @@ trait TaskExtra extends TaskExtra0 {
val pio = TaskExtra
.processIO(s)
.withInput(out => { BasicIO.transferFully(in, out); out.close() })
(p run pio).exitValue
(p run pio).exitValue()
}
}
@ -246,7 +246,7 @@ trait TaskExtra extends TaskExtra0 {
implicit def processToTask(p: ProcessBuilder)(implicit streams: Task[TaskStreams[_]]): Task[Int] =
streams map { s =>
val pio = TaskExtra.processIO(s)
(p run pio).exitValue
(p run pio).exitValue()
}
}
object TaskExtra extends TaskExtra {

10
tasks-standard/src/test/scala/Test.scala
View File

@ -20,25 +20,25 @@ object Test extends std.TaskExtra {
val b2 = task(true)
val c = task("asdf")
val h1 = t3(a, b, c).map { case (aa, bb, cc) => aa + " " + bb + " " + cc }
val h2 = t3(a, b2, c).map { case (aa, bb, cc) => aa + " " + bb + " " + cc }
val h1 = t3(a, b, c).map { case (aa, bb, cc) => s"$aa $bb $cc" }
val h2 = t3(a, b2, c).map { case (aa, bb, cc) => s"$aa $bb $cc" }
type Values = (Result[Int], Result[Boolean], Result[String])
val f: Values => Any = {
case (Value(aa), Value(bb), Value(cc)) => aa + " " + bb + " " + cc
case (Value(aa), Value(bb), Value(cc)) => s"$aa $bb $cc"
case x =>
val cs = x.productIterator.toList.collect { case Inc(x) => x } // workaround for double definition bug
throw Incomplete(None, causes = cs)
}
val d2 = t3(a, b2, c) mapR f
val f2: Values => Task[Any] = {
case (Value(aa), Value(bb), Value(cc)) => task(aa + " " + bb + " " + cc)
case (Value(aa), Value(bb), Value(cc)) => task(s"$aa $bb $cc")
case _ => d3
}
lazy val d = t3(a, b, c) flatMapR f2
val f3: Values => Task[Any] = {
case (Value(aa), Value(bb), Value(cc)) => task(aa + " " + bb + " " + cc)
case (Value(aa), Value(bb), Value(cc)) => task(s"$aa $bb $cc")
case _ => d2
}
lazy val d3 = t3(a, b, c) flatMapR f3

2
tasks/src/main/scala/sbt/ConcurrentRestrictions.scala
View File

@ -235,7 +235,7 @@ object ConcurrentRestrictions {
sentinels.toList foreach { s =>
s.cancel(true)
}
sentinels.clear
sentinels.clear()
}
def submit(node: A, work: () => R): Unit = synchronized {

4
testing/src/main/scala/sbt/JUnitXmlTestsListener.scala
View File

@ -112,9 +112,9 @@ class JUnitXmlTestsListener(val targetDir: File, legacyTestReport: Boolean, logg
val classnameRegex = s"^($name|${name.split('.').last})\\.?".r
val result =
<testsuite hostname={hostname} name={name} tests={tests + ""} errors={errors + ""} failures={
<testsuite hostname={hostname} name={name} tests={tests.toString} errors={errors.toString} failures={
failures + ""
} skipped={ignoredSkippedPending + ""} time={(duration / 1000.0).toString} timestamp={
} skipped={ignoredSkippedPending.toString} time={(duration / 1000.0).toString} timestamp={
formatISO8601DateTime(timestamp)
}>
{properties}

2
testing/src/main/scala/sbt/TestFramework.scala
View File

@ -256,7 +256,7 @@ object TestFramework {
def foreachListenerSafe(f: TestsListener => Unit): () => Unit =
() => safeForeach(testsListeners, log)(f)
val startTask = foreachListenerSafe(_.doInit)
val startTask = foreachListenerSafe(_.doInit())
val testTasks =
Map(tests.toSeq.flatMap {
case (framework, testDefinitions) =>

2
testing/src/main/scala/sbt/TestStatusReporter.scala
View File

@ -19,7 +19,7 @@ import scala.collection.concurrent
private[sbt] class TestStatusReporter(f: File) extends TestsListener {
private lazy val succeeded: concurrent.Map[String, Long] = TestStatus.read(f)
def doInit = ()
def doInit(): Unit = ()
def startGroup(name: String): Unit = { succeeded remove name; () }
def testEvent(event: TestEvent): Unit = ()
def endGroup(name: String, t: Throwable): Unit = ()

2
testing/src/main/scala/sbt/internal/testing/TestLogger.scala
View File

@ -125,7 +125,7 @@ class TestLogger(val logging: TestLogging) extends TestsListener {
import logging.{ global => log, logTest, managed }
import sbt.protocol.testing.codec.JsonProtocol._
def doInit: Unit = managed.logEvent(Level.Info, TestInitEvent())
def doInit(): Unit = managed.logEvent(Level.Info, TestInitEvent())
def startGroup(name: String): Unit = managed.logEvent(Level.Info, StartTestGroupEvent(name))

2
util-cache/src/main/scala/sbt/util/SeparatedCache.scala
View File

@ -31,7 +31,7 @@ object SingletonCache {
implicit def basicSingletonCache[A: JsonFormat]: SingletonCache[A] =
new SingletonCache[A] {
override def read(from: Input): A = from.read[A]
override def read(from: Input): A = from.read[A]()
override def write(to: Output, value: A) = to.write(value)
}

12
util-cache/src/test/scala/CacheSpec.scala
View File

@ -20,7 +20,7 @@ class CacheSpec extends FlatSpec {
testCache[String, Int] {
case (cache, store) =>
cache(store)("missing") match {
case Hit(_) => fail
case Hit(_) => fail()
case Miss(_) => ()
}
}
@ -30,7 +30,7 @@ class CacheSpec extends FlatSpec {
testCache[String, Int] {
case (cache, store) =>
cache(store)("missing") match {
case Hit(_) => fail
case Hit(_) => fail()
case Miss(update) => update(5)
}
}
@ -41,13 +41,13 @@ class CacheSpec extends FlatSpec {
case (cache, store) =>
val value = 5
cache(store)("someKey") match {
case Hit(_) => fail
case Hit(_) => fail()
case Miss(update) => update(value)
}
cache(store)("someKey") match {
case Hit(read) => assert(read === value); ()
case Miss(_) => fail
case Miss(_) => fail()
}
}
}
@ -58,13 +58,13 @@ class CacheSpec extends FlatSpec {
val key = "someKey"
val value = 5
cache(store)(key) match {
case Hit(_) => fail
case Hit(_) => fail()
case Miss(update) => update(value)
}
cache(store)(key) match {
case Hit(read) => assert(read === value); ()
case Miss(_) => fail
case Miss(_) => fail()
}
}
}

8
util-tracking/src/main/scala/sbt/util/Tracked.scala
View File

@ -69,7 +69,7 @@ object Tracked {
/** Creates a tracker that provides the output of the most recent invocation of the function */
def lastOutput[I, O: JsonFormat](store: CacheStore)(f: (I, Option[O]) => O): I => O = { in =>
val previous = Try { store.read[O] }.toOption
val previous = Try { store.read[O]() }.toOption
val next = f(in, previous)
store.write(next)
next
@ -277,7 +277,7 @@ object Tracked {
}
def changed(store: CacheStore, value: I): Boolean =
Try { store.read[Long] } match {
Try { store.read[Long]() } match {
case USuccess(prev: Long) =>
Hasher.hash(value) match {
case USuccess(keyHash: Int) => keyHash.toLong != prev
@ -321,7 +321,7 @@ class Timestamp(val store: CacheStore, useStartTime: Boolean)(implicit format: J
private def now() = System.currentTimeMillis
def readTimestamp: Long =
Try { store.read[Long] } getOrElse 0
Try { store.read[Long]() } getOrElse 0
}
@deprecated("Use Tracked.inputChanged and Tracked.outputChanged instead", "1.0.1")
@ -342,7 +342,7 @@ class Changed[O: Equiv: JsonFormat](val store: CacheStore) extends Tracked {
def uptodate(value: O): Boolean = {
val equiv: Equiv[O] = implicitly
equiv.equiv(value, store.read[O])
equiv.equiv(value, store.read[O]())
}
}

2
util-tracking/src/test/scala/sbt/util/TrackedSpec.scala
View File

@ -160,7 +160,7 @@ class TrackedSpec extends FlatSpec {
withStore { store =>
val beforeCompletion: String = "before-completion"
val afterCompletion: String = "after-completion"
val sideEffectCompleted = Promise[Unit]
val sideEffectCompleted = Promise[Unit]()
val p0: () => String = () => {
if (sideEffectCompleted.isCompleted) {
afterCompletion