From 9ae55283553fd6e12c26eb1056e0febaa648a04d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 14 Jun 2022 11:07:10 +0200 Subject: [PATCH] :arrow_up: Update im4java version to our internal fork version It fixes the v7 compatibility issues. Now, adding the -Dim4java.useV7=true property to the java command when executing the penpot backend bundle it switches to use the `magick` (ImageMagick v7 CLI) instead of `convert` and `identify`. --- backend/deps.edn | 4 +++- backend/scripts/repl | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/deps.edn b/backend/deps.edn index 506510a99..1ceba4b52 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -34,7 +34,9 @@ buddy/buddy-sign {:mvn/version "3.4.333"} org.jsoup/jsoup {:mvn/version "1.15.1"} - org.im4java/im4java {:mvn/version "1.4.0"} + org.im4java/im4java {:git/tag "1.4.0-penpot-2" :git/sha "e2b3e16" + :git/url "https://github.com/penpot/im4java"} + org.lz4/lz4-java {:mvn/version "1.8.0"} org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"} diff --git a/backend/scripts/repl b/backend/scripts/repl index 49e105305..4e2c58394 100755 --- a/backend/scripts/repl +++ b/backend/scripts/repl @@ -40,6 +40,9 @@ export OPTIONS=" -J-XX:+UnlockDiagnosticVMOptions \ -J-XX:+DebugNonSafepoints"; +# Uncomment for use the ImageMagick v7.x +# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS"; + export OPTIONS_EVAL="nil" # export OPTIONS_EVAL="(set! *warn-on-reflection* true)"