java/proguard
1
0
Fork 0
mirror of https://github.com/Guardsquare/proguard.git synced 2026-03-13 09:50:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Backport DGD-2494

Browse Source
This commit is contained in:
Jago Gyselinck
2020-09-03 10:25:26 +00:00
committed by Eric Lafortune
parent d0e823085a
commit 46b7300da5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
base/src/proguard/obfuscate/MemberNameCollector.java
View File

@@ -92,9 +92,8 @@ implements MemberVisitor
// Isn't there another original name for this new name, or should
// this original name get priority?
String otherName = (String)nameMap.get(newName);
if (otherName == null ||
MemberObfuscator.hasFixedNewMemberName(member) ||
name.compareTo(otherName) < 0)
if (otherName == null ||
MemberObfuscator.hasFixedNewMemberName(member))
{
// Remember not to use the new name again in this name space.
nameMap.put(newName, name);

1
docs/md/releasenotes.md
View File

@@ -2,6 +2,7 @@
| Version| Issue | Module | Explanation
|--------|----------|----------|----------------------------------
| 7.0.1 | DGD-2494 | CORE | Fix naming conflict resolution potentially resulting in the renaming of library members.
| 7.0.1 | | RETRACE | Extend expressions supported by Retrace.
| 7.0.0 | | CORE | Added support for [Kotlin metadata](manual/kotlin.md), with new option `-keepkotlinmetadata`.
| 7.0.0 | PGD-32 | CORE | Allowing Java 14 class files.