Merge pull request #7171 from devinbileck/reduce-javacv-lib-size

Resolve issues with javacv
bisq-network · Jun 29, 2024 · 039d778 · 039d778
2 parents d95b074 + 312022f
commit 039d778
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 4 deletions.
diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -41,7 +41,66 @@ dependencies {
     implementation libs.fontawesomefx.commons
     implementation libs.fontawesomefx.materialdesign.font
     implementation libs.qrgen
-    implementation libs.javacv
+    implementation (libs.javacv) {
+        exclude(module: 'ffmpeg-platform')
+        exclude(module: 'flycapture-platform')
+        exclude(module: 'spinnaker-platform')
+        exclude(module: 'libdc1394-platform')
+        exclude(module: 'libfreenect-platform')
+        exclude(module: 'libfreenect2-platform')
+        exclude(module: 'librealsense-platform')
+        exclude(module: 'librealsense2-platform')
+        exclude(module: 'videoinput-platform')
+        exclude(module: 'artoolkitplus-platform')
+        exclude(module: 'chilitags-platform')
+        exclude(module: 'flandmark-platform')
+        exclude(module: 'arrow-platform')
+        exclude(module: 'hdf5-platform')
+        exclude(module: 'hyperscan-platform')
+        exclude(module: 'lz4-platform')
+        exclude(module: 'mkl-platform')
+        exclude(module: 'mkl-dnn-platform')
+        exclude(module: 'dnnl-platform')
+        exclude(module: 'arpack-ng-platform')
+        exclude(module: 'cminpack-platform')
+        exclude(module: 'fftw-platform')
+        exclude(module: 'gsl-platform')
+        exclude(module: 'cpython-platform')
+        exclude(module: 'numpy-platform')
+        exclude(module: 'scipy-platform')
+        exclude(module: 'gym-platform')
+        exclude(module: 'llvm-platform')
+        exclude(module: 'libffi-platform')
+        exclude(module: 'libpostal-platform')
+        exclude(module: 'libraw-platform')
+        exclude(module: 'leptonica-platform')
+        exclude(module: 'tesseract-platform')
+        exclude(module: 'caffe-platform')
+        exclude(module: 'openpose-platform')
+        exclude(module: 'cuda-platform')
+        exclude(module: 'nvcodec-platform')
+        exclude(module: 'opencl-platform')
+        exclude(module: 'mxnet-platform')
+        exclude(module: 'pytorch-platform')
+        exclude(module: 'sentencepiece-platform')
+        exclude(module: 'tensorflow-platform')
+        exclude(module: 'tensorflow-lite-platform')
+        exclude(module: 'tensorrt-platform')
+        exclude(module: 'tritonserver-platform')
+        exclude(module: 'ale-platform')
+        exclude(module: 'depthai-platform')
+        exclude(module: 'onnx-platform')
+        exclude(module: 'ngraph-platform')
+        exclude(module: 'onnxruntime-platform')
+        exclude(module: 'tvm-platform')
+        exclude(module: 'bullet-platform')
+        exclude(module: 'liquidfun-platform')
+        exclude(module: 'qt-platform')
+        exclude(module: 'skia-platform')
+        exclude(module: 'cpu_features-platform')
+        exclude(module: 'modsecurity-platform')
+        exclude(module: 'systems-platform')
+    }
     implementation libs.apache.commons.lang3
     implementation libs.bouncycastle.bcpg.jdk15on
     implementation libs.fxmisc.easybind

diff --git a/...src/test/java/bisq/desktop/main/account/content/notifications/qr/QrCodeProcessorTest.java b/...src/test/java/bisq/desktop/main/account/content/notifications/qr/QrCodeProcessorTest.java
@@ -21,6 +21,8 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static bisq.desktop.main.account.content.notifications.qr.FrameUtil.createFrameFromImageResource;
 import static bisq.desktop.main.account.content.notifications.qr.FrameUtil.createRandomFrame;
@@ -33,9 +35,7 @@
 import com.google.zxing.BinaryBitmap;
 import org.bytedeco.javacv.Frame;
 
-// TODO Disabled until UnsatisfiedLinkError on MacOS is resolved
-
-@Disabled
+@DisabledOnOs(value= {OS.MAC})
 class QrCodeProcessorTest {
     private final FrameConverter<BinaryBitmap> converter = new FrameToBitmapConverter();
     private final QrCodeProcessor processor = new QrCodeProcessor(converter);