From ecc441a64285de83cf68e949bd3a106522a9904b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 14 Feb 2018 12:50:16 +0100 Subject: [PATCH] Minor, remove obsolete JDK 6-related workaround --- custom-dependencies/protobuf-lite/build.gradle.kts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/custom-dependencies/protobuf-lite/build.gradle.kts b/custom-dependencies/protobuf-lite/build.gradle.kts index 49293815dd7..74fd721d2f4 100644 --- a/custom-dependencies/protobuf-lite/build.gradle.kts +++ b/custom-dependencies/protobuf-lite/build.gradle.kts @@ -33,16 +33,11 @@ task("prepare") { fun loadAllFromJar(file: File): Map> { val result = hashMapOf>() - val jar = JarFile(file) - try { + JarFile(file).use { jar -> for (jarEntry in jar.entries()) { 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 }