Skip to content

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
22

33
vNext
44
----------
5+
- [MAJOR] Update proguard rules (#2372)
56

67
Version 7.1.0
78
----------

common

msal/consumer-rules.pro

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717
#}
1818

1919
##---------------Begin: proguard configuration for MSAL --------
20-
-keep class !com.microsoft.identity.common.java.nativeauth.**, !com.microsoft.identity.common.nativeauth.**, !com.microsoft.identity.nativeauth.**, com.microsoft.identity.** { *; }
2120
-keep class com.microsoft.device.display.** { *; }
2221

22+
# Keep things as they are used in TypeAdapter for deserialization/serialization
23+
-keep class com.microsoft.identity.client.Logger { *; }
24+
-keep class com.microsoft.identity.client.claims.ClaimsRequest { *; }
25+
-keep class com.microsoft.identity.client.claims.RequestedClaimAdditionalInformation { *; }
26+
2327
##---------------Begin: proguard configuration for Nimbus ----------
2428
-keep class com.nimbusds.** { *; }
2529

@@ -35,17 +39,16 @@
3539
-dontwarn sun.misc.**
3640
#-keep class com.google.gson.stream.** { *; }
3741

38-
# Application classes that will be serialized/deserialized over Gson
39-
-keep class com.google.gson.examples.android.model.** { <fields>; }
40-
4142
# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
4243
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
4344
-keep class * extends com.google.gson.TypeAdapter
4445
-keep class * implements com.google.gson.TypeAdapterFactory
4546
-keep class * implements com.google.gson.JsonSerializer
4647
-keep class * implements com.google.gson.JsonDeserializer
48+
-keep class com.google.gson.reflect.TypeToken { *; }
49+
-keep class * extends com.google.gson.reflect.TypeToken { *; }
4750

4851
# Prevent R8 from leaving Data object members always null
49-
-keepclassmembers,allowobfuscation class * {
52+
-keepclassmembers class * {
5053
@com.google.gson.annotations.SerializedName <fields>;
5154
}

testapps/testapp/proguard-rules.pro

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,18 @@
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
1717
#}
18+
-dontwarn com.google.crypto.tink.subtle.Ed25519Sign$KeyPair
19+
-dontwarn com.google.crypto.tink.subtle.Ed25519Sign
20+
-dontwarn com.google.crypto.tink.subtle.Ed25519Verify
21+
-dontwarn com.google.crypto.tink.subtle.X25519
22+
-dontwarn com.google.crypto.tink.subtle.XChaCha20Poly1305
23+
-dontwarn org.bouncycastle.asn1.ASN1Encodable
24+
-dontwarn org.bouncycastle.asn1.pkcs.PrivateKeyInfo
25+
-dontwarn org.bouncycastle.asn1.x509.AlgorithmIdentifier
26+
-dontwarn org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
27+
-dontwarn org.bouncycastle.cert.X509CertificateHolder
28+
-dontwarn org.bouncycastle.cert.jcajce.JcaX509CertificateHolder
29+
-dontwarn org.bouncycastle.jce.provider.BouncyCastleProvider
30+
-dontwarn org.bouncycastle.openssl.PEMKeyPair
31+
-dontwarn org.bouncycastle.openssl.PEMParser
32+
-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter

0 commit comments

Comments
 (0)