Changeset 4730 in josm

Timestamp:

Dec 28, 2011 3:21:00 PM (17 months ago)

Author:

jttt

Message:

New proguard, update proguard configuration

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• tools/proguard.jar (modified) (previous)

trunk/build.xml

@@ -199 +199 @@
                 -dontobfuscate
 
+                # These options probably are not necessary (and make processing a bit slower)
                 -dontskipnonpubliclibraryclasses
+                -dontskipnonpubliclibraryclassmembers
 
                 -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
                     public static void main(java.lang.String[]);
                 }
+                -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplet
 
                 -keep class JOSM
                 -keep class * extends org.openstreetmap.josm.io.FileImporter
                 -keep class * extends org.openstreetmap.josm.io.FileExporter
-                -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+                -keep class org.openstreetmap.josm.data.imagery.types.Adapter1
+                -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
 
                 -keepclassmembers enum  * {
@@ -215 +219 @@
                 }
 
+                # Keep unused public methods (can be useful for plugins)
                 -keepclassmembers class * {
                     public protected *;
                 }
+                
+                # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'. This notes should not be a problem as we don't use obfuscation
+                -dontnote
                 </proguard>
     </target>