Skip to content

Commit 3c613f7

Browse files
committed
use ZIS to get META-INF/MANIFEST.MF and keep functional parity with containsAtLeast/Only/None
1 parent 52f21b0 commit 3c613f7

File tree

1 file changed

+2
-1
lines changed
  • src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit

1 file changed

+2
-1
lines changed

src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/JarPath.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import java.nio.file.Path
1010
import java.util.jar.JarFile
1111
import java.util.jar.JarInputStream
1212
import java.util.zip.ZipFile
13+
import java.util.zip.ZipInputStream
1314
import kotlin.io.path.inputStream
1415

1516
/**
@@ -91,7 +92,7 @@ fun Assert<JarPath>.containsOnly(vararg entries: String) = toEntries().containsO
9192
* Used alone, without [containsAtLeast] or [containsNone].
9293
*/
9394
fun Assert<JarPath>.containsExactlyInAnyOrder(vararg entries: String) = transform { actual ->
94-
JarInputStream(actual.path.inputStream()).use { jarInput ->
95+
ZipInputStream(actual.path.inputStream()).use { jarInput ->
9596
val allEntries = mutableListOf<String>()
9697
while (true) {
9798
val entry = jarInput.nextEntry ?: break

0 commit comments

Comments
 (0)