mirror of
https://github.com/packwiz/packwiz-installer.git
synced 2025-04-19 21:16:30 +02:00
Fix build on J9+, exclude kotlin_metadata again (used to be removed with annots, but those are necessary)
This commit is contained in:
parent
d2556c4b4a
commit
5e39907fae
@ -54,6 +54,8 @@ licenseReport {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.shadowJar {
|
tasks.shadowJar {
|
||||||
|
exclude("**/*.kotlin_metadata")
|
||||||
|
exclude("**/*.kotlin_builtins")
|
||||||
exclude("META-INF/maven/**/*")
|
exclude("META-INF/maven/**/*")
|
||||||
exclude("META-INF/proguard/**/*")
|
exclude("META-INF/proguard/**/*")
|
||||||
|
|
||||||
@ -80,7 +82,10 @@ tasks.register<JavaExec>("shrinkJar") {
|
|||||||
"--output", r8File.toString(),
|
"--output", r8File.toString(),
|
||||||
"--pg-conf", rules.toString(),
|
"--pg-conf", rules.toString(),
|
||||||
"--lib", System.getProperty("java.home"),
|
"--lib", System.getProperty("java.home"),
|
||||||
"--lib", System.getProperty("java.home") + "/lib/jce.jar", // javax.crypto, necessary on <1.9 for compiling Okio
|
*(if (System.getProperty("java.version").startsWith("1.")) {
|
||||||
|
// javax.crypto, necessary on <1.9 for compiling Okio
|
||||||
|
arrayOf("--lib", System.getProperty("java.home") + "/lib/jce.jar")
|
||||||
|
} else { arrayOf() }),
|
||||||
tasks.shadowJar.get().archiveFile.get().asFile.toString()
|
tasks.shadowJar.get().archiveFile.get().asFile.toString()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user