tony_all
/
Maxlib-GradlePlugin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5 from Itsusinn/master 

fix(RelocateJar): ZipException due to duplicate files
This commit is contained in:
坏黑 2021-07-29 20:51:37 +08:00 committed by GitHub
parent 2340a7d726 47fa2ddc0a
commit aefa846d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy
View File

@ -18,6 +18,7 @@ import java.util.jar.JarEntry
import java.util.jar.JarFile
import java.util.jar.JarOutputStream
import java.util.stream.Collectors
import java.util.zip.ZipException
@ToString
class RelocateJar extends DefaultTask {
@ -61,10 +62,20 @@ class RelocateJar extends DefaultTask {
remapper.remapper = rem
reader.accept(rem, 0)
isolated.putAll(visitor.isolated)
out.putNextEntry(new JarEntry(remapper.map(jarEntry.name)))
try {
out.putNextEntry(new JarEntry(remapper.map(jarEntry.name)))
} catch(ZipException zipException) {
println(zipException)
return true
}
out.write(writer.toByteArray())
} else {
out.putNextEntry(new JarEntry(remapper.map(jarEntry.name)))
try {
out.putNextEntry(new JarEntry(remapper.map(jarEntry.name)))
} catch(ZipException zipException) {
println(zipException)
return true
}
while ((n = it.read(buf)) != -1) {
out.write(buf, 0, n)
}