reformat

Author: Mohit

common/consumer-rules.pro

@@ -18,6 +18,33 @@
 
 ##---------------Begin: proguard configuration for Common  --------
 # Intentionally blank, left to consumers of common to implement.
+# keep with optmizations and shrinking, but do not obfuscate
+-keep,allowoptimization,allowshrinking class !com.microsoft.identity.common.java.nativeauth.**, !com.microsoft.identity.common.nativeauth.**, com.microsoft.identity.** { *; }
+-keep class * extends com.microsoft.identity.common.java.authorities.Authority { *; }
+-keep class * extends com.microsoft.identity.common.java.authorities.AzureActiveDirectoryAudience { *; }
+-keep class * extends com.microsoft.identity.common.java.cache.ICacheRecord { *; }
+-keep class * extends com.microsoft.identity.common.java.cache.ITokenCacheItem { *; }
+-keep class * extends com.microsoft.identity.common.java.authscheme.AbstractAuthenticationScheme { *; }
+-keep class com.microsoft.identity.common.internal.broker.AuthUxJsonPayload { *; }
+
+
+#For Android Credential Manager: https://developer.android.com/training/sign-in/passkeys#proguard
+-if class androidx.credentials.CredentialManager
+-keep class androidx.credentials.playservices.** {
+  *;
+}
+
+# Runtime annotations
+-keep class net.jcip.annotations.GuardedBy
+-keep class net.jcip.annotations.Immutable
+-keep class net.jcip.annotations.ThreadSafe
+
+# Compile time annotations
+-dontwarn edu.umd.cs.findbugs.annotations.NonNull
+-dontwarn edu.umd.cs.findbugs.annotations.Nullable
+-dontwarn edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+
+-keepattributes SourceFile,LineNumberTable
 
 ##---------------Begin: proguard configuration for Nimbus  ----------
 # Intentionally blank, left to consumers of common to implement.
@@ -28,7 +55,7 @@
 ##---------------Begin: proguard configuration for Gson  --------
 # Gson uses generic type information stored in a class file when working with fields. Proguard
 # removes such information by default, so configure it to keep all of it.
--keepattributes Signature
+-keepattributes Signature,SourceFile,LineNumberTable
 
 # For using GSON @Expose annotation
 -keepattributes *Annotation*
@@ -37,9 +64,6 @@
 -dontwarn sun.misc.**
 #-keep class com.google.gson.stream.** { *; }
 
-# Application classes that will be serialized/deserialized over Gson
--keep class com.google.gson.examples.android.model.** { <fields>; }
-
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
 -keep class * extends com.google.gson.TypeAdapter
@@ -49,42 +73,18 @@
 -keep class com.google.gson.reflect.TypeToken { *; }
 -keep class * extends com.google.gson.reflect.TypeToken { *; }
 
+##---------------Begin: proguard configuration for OpenTelemetry  --------
 # keep everything in this package from being removed or renamed
 -keep class io.opentelemetry.** { *; }
 
-# keep names only to allow keeping them logs and exceptions
--keepnames class com.microsoft.identity.** { *; }
-
 # Prevent R8 from leaving Data object members always null
 -keepclassmembers class com.microsoft.identity.** {
   @com.google.gson.annotations.SerializedName <fields>;
   @com.squareup.moshi.Json <fields>;
 }
 
--keep class * extends com.microsoft.identity.common.java.authorities.Authority { *; }
--keep class * extends com.microsoft.identity.common.java.authorities.AzureActiveDirectoryAudience { *; }
--keep class * extends com.microsoft.identity.common.java.cache.ICacheRecord { *; }
--keep class * extends com.microsoft.identity.common.java.cache.ITokenCacheItem { *; }
--keep class * extends com.microsoft.identity.common.java.authscheme.AbstractAuthenticationScheme { *; }
--keep class com.microsoft.identity.common.internal.broker.AuthUxJsonPayload { *;}
-
-
-#For Android Credential Manager: https://developer.android.com/training/sign-in/passkeys#proguard
--if class androidx.credentials.CredentialManager
--keep class androidx.credentials.playservices.** {
-  *;
-}
-
-# Runtime annotations
--keep class net.jcip.annotations.GuardedBy
--keep class net.jcip.annotations.Immutable
--keep class net.jcip.annotations.ThreadSafe
-
-# Compile time annotations
--dontwarn edu.umd.cs.findbugs.annotations.NonNull
--dontwarn edu.umd.cs.findbugs.annotations.Nullable
--dontwarn edu.umd.cs.findbugs.annotations.SuppressFBWarnings
-
+## Other
+# Compile time annotation
 -dontwarn com.google.auto.value.AutoValue$CopyAnnotations
 -dontwarn com.google.auto.value.AutoValue
 -dontwarn com.google.auto.value.extension.memoized.Memoized