From b905d52efbae3895adcc50867942b7e4cbdb7dbb Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Tue, 2 Apr 2024 15:47:47 +0800 Subject: [PATCH 1/8] Remove extra ProGuard rules after OkHttp udpate https://square.github.io/okhttp/changelogs/changelog_4x/#version-4110 --- app/proguard-rules.pro | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9c7f3b935..5f4922bce 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,13 +1,3 @@ --dontwarn org.bouncycastle.jsse.BCSSLParameters --dontwarn org.bouncycastle.jsse.BCSSLSocket --dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider --dontwarn org.conscrypt.Conscrypt$Version --dontwarn org.conscrypt.Conscrypt --dontwarn org.conscrypt.ConscryptHostnameVerifier --dontwarn org.openjsse.javax.net.ssl.SSLParameters --dontwarn org.openjsse.javax.net.ssl.SSLSocket --dontwarn org.openjsse.net.ssl.OpenJSSE - # Fix for Retrofit issue https://github.com/square/retrofit/issues/3751 # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items). -keep,allowobfuscation,allowshrinking interface retrofit2.Call @@ -16,4 +6,4 @@ # With R8 full mode generic signatures are stripped for classes that are not # kept. Suspend functions are wrapped in continuations where the type argument # is used. --keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation \ No newline at end of file +-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation From 56b9871fae8428cd40a941af8561403362b82df5 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 16 Jun 2024 18:51:42 +0100 Subject: [PATCH 2/8] Replace bash commands with proper svgo cli Although this adds another requirement to execute this script, it will prevent OS-specific issues on `sed` and `grep` as described in #1503, and make sure anyone can generate the same SVG output files. `--pretty` is kept for convenience but can be removed if needed. --- generateModuleGraphs.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/generateModuleGraphs.sh b/generateModuleGraphs.sh index eacf19eed..483ea836f 100755 --- a/generateModuleGraphs.sh +++ b/generateModuleGraphs.sh @@ -31,6 +31,14 @@ then exit 1 fi +# Check if the svgo command is available +if ! command -v svgo &> /dev/null +then + echo "The 'svgo' command is not found. This is required to cleanup and compress SVGs." + echo "Installation instructions available at https://github.com/svg/svgo." + exit 1 +fi + # Check for a version of grep which supports Perl regex. # On MacOS the OS installed grep doesn't support Perl regex so check for the existence of the # GNU version instead which is prefixed with 'g' to distinguish it from the OS installed version. @@ -114,11 +122,10 @@ echo "$module_paths" | while read -r module_path; do -Pmodules.graph.of.module="${module_path}" /-->\x0/g' | grep -zv '^