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

Fix util-cache cross-compilation

This commit is contained in:
Adrien Piquerez 2023-11-14 11:45:09 +01:00
parent 73e3b43683
commit eba41fb3b0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ final case class FilesInfo[F <: FileInfo] private[sbt] (files: Set[F])
object FilesInfo { object FilesInfo {
def empty[F <: FileInfo]: FilesInfo[F] = FilesInfo(Set.empty[F]) 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)) projectFormat(_.files, (fs: Set[F]) => FilesInfo(fs))
def full: FileInfo.Style = FileInfo.full def full: FileInfo.Style = FileInfo.full

3
util-cache/src/main/scala/sbt/util/Input.scala
View File

@ -30,8 +30,9 @@ class PlainInput[J: IsoString](input: InputStream, converter: SupportConverter[J
val bufferSize = 1024 val bufferSize = 1024
val buffer = new Array[Char](bufferSize) val buffer = new Array[Char](bufferSize)
var read = 0 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.appendAll(buffer, 0, read)
}
builder.toString() builder.toString()
} }