diff --git a/util-cache/src/main/scala/sbt/util/FileInfo.scala b/util-cache/src/main/scala/sbt/util/FileInfo.scala index f4351f031..3fbb8de6f 100644 --- a/util-cache/src/main/scala/sbt/util/FileInfo.scala +++ b/util-cache/src/main/scala/sbt/util/FileInfo.scala @@ -64,7 +64,7 @@ final case class FilesInfo[F <: FileInfo] private[sbt] (files: Set[F]) object FilesInfo { def empty[F <: FileInfo]: FilesInfo[F] = FilesInfo(Set.empty[F]) - given format[F <: FileInfo: JsonFormat]: JsonFormat[FilesInfo[F]] = + implicit def format[F <: FileInfo: JsonFormat]: JsonFormat[FilesInfo[F]] = projectFormat(_.files, (fs: Set[F]) => FilesInfo(fs)) def full: FileInfo.Style = FileInfo.full diff --git a/util-cache/src/main/scala/sbt/util/Input.scala b/util-cache/src/main/scala/sbt/util/Input.scala index 1f447265f..3d7438b9e 100644 --- a/util-cache/src/main/scala/sbt/util/Input.scala +++ b/util-cache/src/main/scala/sbt/util/Input.scala @@ -30,8 +30,9 @@ class PlainInput[J: IsoString](input: InputStream, converter: SupportConverter[J val bufferSize = 1024 val buffer = new Array[Char](bufferSize) var read = 0 - while { read = reader.read(buffer, 0, bufferSize); read != -1 } do + while ({ read = reader.read(buffer, 0, bufferSize); read != -1 }) { builder.appendAll(buffer, 0, read) + } builder.toString() }