From 96c0e5fb03776e68d42b356dab1f2c8852ab5149 Mon Sep 17 00:00:00 2001 From: Daniel Chao Date: Fri, 23 Feb 2024 09:07:18 -0800 Subject: [PATCH] Add com.oracle.truffle to shaded libs (#238) This allows two libraries that use Truffle to coexist in a host application. --- buildSrc/src/main/kotlin/pklFatJar.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/pklFatJar.gradle.kts b/buildSrc/src/main/kotlin/pklFatJar.gradle.kts index fef4f611..084cdba7 100644 --- a/buildSrc/src/main/kotlin/pklFatJar.gradle.kts +++ b/buildSrc/src/main/kotlin/pklFatJar.gradle.kts @@ -23,9 +23,7 @@ val firstPartySourcesJarsConfiguration: Configuration = configurations.create("f val relocations = mapOf( // pkl-core dependencies "org.antlr.v4." to "org.pkl.thirdparty.antlr.v4.", - // https://github.com/oracle/graal/issues/1644 has been fixed, - // but native-image still fails when shading com.oracle.truffle - //"com.oracle.truffle" to "org.pkl.thirdparty.truffle", + "com.oracle.truffle" to "org.pkl.thirdparty.truffle", "org.graalvm." to "org.pkl.thirdparty.graalvm.", "org.organicdesign.fp." to "org.pkl.thirdparty.paguro.", "org.snakeyaml.engine." to "org.pkl.thirdparty.snakeyaml.engine.",