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

[2.x] refactor: Use InputStream.transferTo (#8896) 

https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/io/InputStream.html#transferTo(java.io.OutputStream)
This commit is contained in:
kenji yoshida 2026-03-12 03:32:40 +09:00 committed by GitHub
parent 09c76127a3
commit 5fb9f3c5fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
launcher-package/build.sbt
View File

@ -117,12 +117,7 @@ val launcherPackage = (project in file(".")).
val input = connection.getInputStream
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(file))
try {
val buffer = new Array[Byte](8192)
var bytesRead = input.read(buffer)
while (bytesRead != -1) {
writer.write(buffer, 0, bytesRead)
bytesRead = input.read(buffer)
}
input.transferTo(writer)
} finally {
input.close()
writer.close()
@ -153,12 +148,7 @@ val launcherPackage = (project in file(".")).
val input = connection.getInputStream
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(macosUniversalTar))
try {
val buffer = new Array[Byte](8192)
var bytesRead = input.read(buffer)
while (bytesRead != -1) {
writer.write(buffer, 0, bytesRead)
bytesRead = input.read(buffer)
}
input.transferTo(writer)
} finally {
input.close()
writer.close()
@ -175,12 +165,7 @@ val launcherPackage = (project in file(".")).
val input = connection.getInputStream
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(linuxX86Tar))
try {
val buffer = new Array[Byte](8192)
var bytesRead = input.read(buffer)
while (bytesRead != -1) {
writer.write(buffer, 0, bytesRead)
bytesRead = input.read(buffer)
}
input.transferTo(writer)
} finally {
input.close()
writer.close()
@ -197,12 +182,7 @@ val launcherPackage = (project in file(".")).
val input = connection.getInputStream
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(linuxAarch64Tar))
try {
val buffer = new Array[Byte](8192)
var bytesRead = input.read(buffer)
while (bytesRead != -1) {
writer.write(buffer, 0, bytesRead)
bytesRead = input.read(buffer)
}
input.transferTo(writer)
} finally {
input.close()
writer.close()
@ -219,12 +199,7 @@ val launcherPackage = (project in file(".")).
val input = connection.getInputStream
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(windowsZip))
try {
val buffer = new Array[Byte](8192)
var bytesRead = input.read(buffer)
while (bytesRead != -1) {
writer.write(buffer, 0, bytesRead)
bytesRead = input.read(buffer)
}
input.transferTo(writer)
} finally {
input.close()
writer.close()
@ -458,12 +433,7 @@ def downloadUrl(uri: URI, out: File): Unit =
val input = connection.getInputStream
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(out))
try {
val buffer = new Array[Byte](8192)
var bytesRead = input.read(buffer)
while (bytesRead != -1) {
writer.write(buffer, 0, bytesRead)
bytesRead = input.read(buffer)
}
input.transferTo(writer)
} finally {
input.close()
writer.close()

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

@ -110,14 +110,7 @@ private[sbt] object InstallSbtn {
try {
val os = new FileOutputStream(path.toFile)
try {
val result = new Array[Byte](1024 * 1024)
var bytesRead = -1
def impl(): Unit = {
bytesRead = inputStream.read(result)
if (bytesRead > 0) os.write(result, 0, bytesRead)
}
impl()
while bytesRead > 0 do impl()
inputStream.transferTo(os)
} finally os.close()
} finally inputStream.close()
private def getShell(term: Terminal): String = {