From eec30b7b7b8ef7ec5b3cc78df19fe7f60721d278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karlo=20=C4=8Ceh?= Date: Wed, 6 Mar 2024 11:19:08 +0100 Subject: [PATCH] Revert "Merge branch 'develop' into fix/trigger-init-not-working-properly-on-first-start" This reverts commit d4741a64da76fdfdbcffd0655045e9b45e6d978e, reversing changes made to c0eee7bd8440022605df32fa9cd5db104d495e93. --- sentinel-no-op/proguard-rules.txt | 36 +++++++++++++++++++++++++- sentinel/proguard-rules.txt | 40 ++++++++++++++++++++++++++++- tool-appgallery/proguard-rules.txt | 6 ++++- tool-chucker/proguard-rules.txt | 6 ++++- tool-collar/proguard-rules.txt | 6 ++++- tool-dbinspector/proguard-rules.txt | 6 ++++- tool-googleplay/proguard-rules.txt | 6 ++++- tool-leakcanary/proguard-rules.txt | 6 ++++- tool-thimble/proguard-rules.txt | 6 ++++- tool-timber/proguard-rules.txt | 6 ++++- 10 files changed, 114 insertions(+), 10 deletions(-) diff --git a/sentinel-no-op/proguard-rules.txt b/sentinel-no-op/proguard-rules.txt index 0674e774..3ce9626f 100644 --- a/sentinel-no-op/proguard-rules.txt +++ b/sentinel-no-op/proguard-rules.txt @@ -1 +1,35 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.* { + public protected *; +} +-keep public class com.infinum.sentinel.Sentinel { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.ChuckerTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.CollarTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.DbInspectorTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.LeakCanaryTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.AppGalleryTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.GooglePlayTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.ThimbleTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.TimberTool { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.CertificateTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** \ No newline at end of file diff --git a/sentinel/proguard-rules.txt b/sentinel/proguard-rules.txt index 0674e774..7bfc6c44 100644 --- a/sentinel/proguard-rules.txt +++ b/sentinel/proguard-rules.txt @@ -1 +1,39 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.* { + public protected *; +} +-keep public class com.infinum.sentinel.Sentinel { + public protected *; +} +-keep public class com.infinum.sentinel.ui.tools.CertificateTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** + +# KotlinX Serialization +-if @kotlinx.serialization.Serializable class ** +-keepclassmembers class <1> { + static <1>$Companion Companion; +} +-if @kotlinx.serialization.Serializable class ** { + static **$* *; +} +-keepclassmembers class <1>$<3> { + kotlinx.serialization.KSerializer serializer(...); +} +-if @kotlinx.serialization.Serializable class ** { + public static ** INSTANCE; +} +-keepclassmembers class <1> { + public static <1> INSTANCE; + kotlinx.serialization.KSerializer serializer(...); +} +-keepattributes RuntimeVisibleAnnotations,AnnotationDefault +-keepattributes InnerClasses # Needed for `getDeclaredClasses`. +-keepnames class <1>$$serializer { # -keepnames suffices; class is kept when serializer() is kept. + static <1>$$serializer INSTANCE; +} + +-keep class * extends androidx.room.RoomDatabase +-keep @androidx.room.Entity class * +-keep @androidx.room.TypeConverters class * \ No newline at end of file diff --git a/tool-appgallery/proguard-rules.txt b/tool-appgallery/proguard-rules.txt index 0674e774..8fedccd3 100644 --- a/tool-appgallery/proguard-rules.txt +++ b/tool-appgallery/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.AppGalleryTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** diff --git a/tool-chucker/proguard-rules.txt b/tool-chucker/proguard-rules.txt index 0674e774..dff7c096 100644 --- a/tool-chucker/proguard-rules.txt +++ b/tool-chucker/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.ChuckerTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** diff --git a/tool-collar/proguard-rules.txt b/tool-collar/proguard-rules.txt index 0674e774..eab87141 100644 --- a/tool-collar/proguard-rules.txt +++ b/tool-collar/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.CollarTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** diff --git a/tool-dbinspector/proguard-rules.txt b/tool-dbinspector/proguard-rules.txt index 0674e774..b914121f 100644 --- a/tool-dbinspector/proguard-rules.txt +++ b/tool-dbinspector/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.DbInspectorTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** \ No newline at end of file diff --git a/tool-googleplay/proguard-rules.txt b/tool-googleplay/proguard-rules.txt index 0674e774..ba10a085 100644 --- a/tool-googleplay/proguard-rules.txt +++ b/tool-googleplay/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.GooglePlayTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** diff --git a/tool-leakcanary/proguard-rules.txt b/tool-leakcanary/proguard-rules.txt index 0674e774..d35cf0ff 100644 --- a/tool-leakcanary/proguard-rules.txt +++ b/tool-leakcanary/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.LeakCanaryTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** diff --git a/tool-thimble/proguard-rules.txt b/tool-thimble/proguard-rules.txt index 0674e774..81486b1d 100644 --- a/tool-thimble/proguard-rules.txt +++ b/tool-thimble/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.ThimbleTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.** diff --git a/tool-timber/proguard-rules.txt b/tool-timber/proguard-rules.txt index 0674e774..d6451db4 100644 --- a/tool-timber/proguard-rules.txt +++ b/tool-timber/proguard-rules.txt @@ -1 +1,5 @@ --dontobfuscate \ No newline at end of file +-keeppackagenames +-keep public class com.infinum.sentinel.ui.tools.TimberTool { + public protected *; +} +-keep public class com.infinum.sentinel.databinding.**