From 5e39907fae52b660a26a3b9132f46cc687a01ce8 Mon Sep 17 00:00:00 2001 From: comp500 Date: Sun, 19 Jun 2022 19:39:45 +0100 Subject: [PATCH] Fix build on J9+, exclude kotlin_metadata again (used to be removed with annots, but those are necessary) --- build.gradle.kts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 721f54e..538d1d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,6 +54,8 @@ licenseReport { } tasks.shadowJar { + exclude("**/*.kotlin_metadata") + exclude("**/*.kotlin_builtins") exclude("META-INF/maven/**/*") exclude("META-INF/proguard/**/*") @@ -80,7 +82,10 @@ tasks.register("shrinkJar") { "--output", r8File.toString(), "--pg-conf", rules.toString(), "--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() ) }