Add rules to stop LazyClassKey referenced classes being merged with R8.

wanyingd1996 · Dagger Team · commit 81512af9ee64 · 2024-06-14T12:29:06.000-07:00
Also adjusted the proguard rule to avoid keeping the LazyClassKeyProvider which is unnecessary.

Issue#4323

RELNOTES=n/a
PiperOrigin-RevId: 643422417
diff --git a/java/dagger/proguard.pro b/java/dagger/proguard.pro
@@ -1,3 +1,3 @@
--keepclasseswithmembers,includedescriptorclasses class * {
+-keepclassmembers,includedescriptorclasses class * {
    @dagger.internal.KeepFieldType <fields>;
 }
diff --git a/java/dagger/r8.pro b/java/dagger/r8.pro
@@ -1,3 +1,6 @@
 -identifiernamestring @dagger.internal.IdentifierNameString class ** {
     static java.lang.String *;
+}
+-keepclassmembers,includedescriptorclasses,allowobfuscation,allowshrinking class * {
+   @dagger.internal.KeepFieldType <fields>;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`--keepclasseswithmembers,includedescriptorclasses class * {`
	`1`	`+-keepclassmembers,includedescriptorclasses class * {`
`2`	`2`	`@dagger.internal.KeepFieldType <fields>;`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`-identifiernamestring @dagger.internal.IdentifierNameString class ** {`
`2`	`2`	`static java.lang.String *;`
	`3`	`+}`
	`4`	`+-keepclassmembers,includedescriptorclasses,allowobfuscation,allowshrinking class * {`
	`5`	`+ @dagger.internal.KeepFieldType <fields>;`
`3`	`6`	`}`