Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to allow LeakCanary to work with ProGuard. #398

Merged
merged 1 commit into from
Jan 23, 2016

Conversation

rogerhu
Copy link
Contributor

@rogerhu rogerhu commented Jan 19, 2016

-dontwarn com.squareup.haha.guava.**
-dontwarn com.squareup.haha.perflib.**
-dontwarn com.squareup.haha.trove.**
-dontwarn com.squareup.leakcanary.**
-keep class org.eclipse.mat.** { *; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one should be removed, we don't use eclipse mat anymore.

@pyricau
Copy link
Member

pyricau commented Jan 23, 2016

Thanks!

@pyricau
Copy link
Member

pyricau commented Jan 23, 2016

This should fix #394

@rogerhu
Copy link
Contributor Author

rogerhu commented Jan 23, 2016

Pushed

@rogerhu
Copy link
Contributor Author

rogerhu commented Jan 23, 2016

CLA filled out.

@vanniktech
Copy link
Contributor

Isn't the -dontwarn android.app.Notification missing in the README?

@pyricau
Copy link
Member

pyricau commented Jan 23, 2016

@vanniktech that's a fair point, however I think I'll do a follow up PR and just remove the proguard part in the readme. That proguard file is supposed to take care of it, and if for whatever reason someone needs to go manual, they can go manual. I'd rather have one source of truth.

Fix ProGuard rules for debug builds.

Kill Eclipse
@rogerhu
Copy link
Contributor Author

rogerhu commented Jan 23, 2016

I just deleted it from the README.

pyricau added a commit that referenced this pull request Jan 23, 2016
Fixes to allow LeakCanary to work with ProGuard.
@pyricau pyricau merged commit 8d37182 into square:master Jan 23, 2016
@rogerhu
Copy link
Contributor Author

rogerhu commented Jan 24, 2016

Thanks!

I just pulled down https://oss.sonatype.org/content/repositories/snapshots/com/squareup/leakcanary/leakcanary-android/1.4-SNAPSHOT/leakcanary-android-1.4-20160123.012540-30.aar and the old proguard.txt is still being included. Does some type of cache need to be deleted to rebuild?

@pyricau
Copy link
Member

pyricau commented Jan 24, 2016

True, I just confirmed. I checked BuildConfig.GIT_SHA in that aar and the SHA is 7e61d8c.

Interestingly, https://oss.sonatype.org/content/repositories/snapshots/com/squareup/leakcanary/leakcanary-android/1.4-SNAPSHOT/leakcanary-android-1.4-20160123.012400-29.aar has it and has the right proguard changes, despite being published before the one you just linked.

I merged another PR and then this PR, so those two commits to master got built. However, the first PR finished last and published a snapshot that wasn't the last master.

Should be fixed by now since we have a new snapshot, https://oss.sonatype.org/content/repositories/snapshots/com/squareup/leakcanary/leakcanary-android/1.4-SNAPSHOT/leakcanary-android-1.4-20160124.184802-31.aar

@vanniktech
Copy link
Contributor

1.4-beta1 does not contain those changes right?

@pyricau
Copy link
Member

pyricau commented Mar 19, 2016

nope.

@pyricau pyricau added this to the 1.4 milestone Mar 19, 2016
Pengchengxiang pushed a commit to XLibrarys/leakcanary that referenced this pull request Jan 2, 2017
Fixes to allow LeakCanary to work with ProGuard.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants