From eba41fb3b01be1b4255e6443e321cc5a249f6823 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Tue, 14 Nov 2023 11:45:09 +0100 Subject: [PATCH] Fix util-cache cross-compilation --- util-cache/src/main/scala/sbt/util/FileInfo.scala | 2 +- util-cache/src/main/scala/sbt/util/Input.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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() }