azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, remove obsolete JDK 6-related workaround

Browse Source
This commit is contained in:
Alexander Udalov
2018-02-14 12:50:16 +01:00
parent 60a551404a
commit ecc441a642
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom-dependencies/protobuf-lite/build.gradle.kts
+1 -6
View File
@@ -33,16 +33,11 @@ task("prepare") {
fun loadAllFromJar(file: File): Map<String, Pair<JarEntry, ByteArray>> { fun loadAllFromJar(file: File): Map<String, Pair<JarEntry, ByteArray>> {
val result = hashMapOf<String, Pair<JarEntry, ByteArray>>() val result = hashMapOf<String, Pair<JarEntry, ByteArray>>()
val jar = JarFile(file) JarFile(file).use { jar ->
try {
for (jarEntry in jar.entries()) { for (jarEntry in jar.entries()) {
result[jarEntry.name] = Pair(jarEntry, jar.getInputStream(jarEntry).readBytes()) result[jarEntry.name] = Pair(jarEntry, jar.getInputStream(jarEntry).readBytes())
} }
} }
finally {
// Yes, JarFile does not extend Closeable on JDK 6 so we can't use "use" here
jar.close()
}
return result return result
} }