Changeset 7351 in josm

Timestamp:

2014-07-31T12:36:48+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10325 - WMS not working if JOSM compiled with dist-optimized:

• fix build
• update to Proguard 4.11
• disable "Sun internal API" warnings introduced recently

Location:

trunk

Files:

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

trunk/build.xml

@@ -237 +237 @@
             <compilerarg value="-Xlint:try"/>
             <compilerarg value="-Xlint:unchecked"/>
+                <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
+            <compilerarg value="-XDignore.symbol.file"/>
         </javac>
         <copy todir="build" failonerror="no" includeemptydirs="no">
@@ -426 +428 @@
                 -keep class * extends org.openstreetmap.josm.io.FileImporter
                 -keep class * extends org.openstreetmap.josm.io.FileExporter
-                -keep class org.openstreetmap.josm.data.imagery.types.Adapter1
+                -keep class org.w3._2001.xmlschema.Adapter1
                 -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
 
@@ -439 +441 @@
                 }
 
-                # 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
+                # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
+                # This note should not be a problem as we don't use obfuscation
                 -dontnote
         </proguard>