From 4643f10b0698efcd49a3f5481441d0ce290d6930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sun, 29 Sep 2024 17:40:50 +0100 Subject: [PATCH] Disambiguate mordant.pro (#232) This change enables use of `duplicatesStrategy = DuplicatesStrategy.FAIL`, which currently fails due to: > What went wrong: > \> Execution failed for task ':ghlint-cli:fatJar'. > Cannot copy zip entry 'Z:\caches\gradle\caches\modules-2\files-2.1\com.github.ajalt.mordant\mordant-jvm-graal-ffi-jvm\3.0.0\e5c456bbad024da819bffde07a223ae6cb9582a3\mordant-jvm-graal-ffi-jvm.jar!META-INF/proguard/mordant.pro' to 'META-INF/proguard/mordant.pro' because zip entry 'Z:\caches\gradle\caches\modules-2\files-2.1\com.github.ajalt.mordant\mordant-jvm-jna-jvm\3.0.0\bde15ea7842e9b77dec187390cde07bf6c15b14d\mordant-jvm-jna-jvm.jar!META-INF/proguard/mordant.pro' has already been copied there. Note: even though DuplicateStrategy.INCLUDE works around this problem, R8 does not support it: > \> Task :ghlint-cli:r8Jar > Warning: Resource 'META-INF/proguard/mordant.pro' already exists. --- .../META-INF/proguard/{mordant.pro => mordant-jvm-graal-ffi.pro} | 0 .../META-INF/proguard/{mordant.pro => mordant-jvm-jna.pro} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename mordant-jvm-graal-ffi/src/jvmMain/resources/META-INF/proguard/{mordant.pro => mordant-jvm-graal-ffi.pro} (100%) rename mordant-jvm-jna/src/jvmMain/resources/META-INF/proguard/{mordant.pro => mordant-jvm-jna.pro} (100%) diff --git a/mordant-jvm-graal-ffi/src/jvmMain/resources/META-INF/proguard/mordant.pro b/mordant-jvm-graal-ffi/src/jvmMain/resources/META-INF/proguard/mordant-jvm-graal-ffi.pro similarity index 100% rename from mordant-jvm-graal-ffi/src/jvmMain/resources/META-INF/proguard/mordant.pro rename to mordant-jvm-graal-ffi/src/jvmMain/resources/META-INF/proguard/mordant-jvm-graal-ffi.pro diff --git a/mordant-jvm-jna/src/jvmMain/resources/META-INF/proguard/mordant.pro b/mordant-jvm-jna/src/jvmMain/resources/META-INF/proguard/mordant-jvm-jna.pro similarity index 100% rename from mordant-jvm-jna/src/jvmMain/resources/META-INF/proguard/mordant.pro rename to mordant-jvm-jna/src/jvmMain/resources/META-INF/proguard/mordant-jvm-jna.pro