Changeset 16169 in josm for trunk

Timestamp:

2020-03-17T22:41:28+01:00 (5 years ago)

Author:

simon04

Message:

see #16860 - Resolve ProGuard using Apache Ivy

Location:

trunk

Files:

• README (modified) (1 diff)
• build.xml (modified) (3 diffs)
• tools/ivy.xml (modified) (2 diffs)
• tools/proguard.jar (deleted)

trunk/README

@@ -161 +161 @@
     - jacocoant.jar         used to include coverage data into JUnit test reports
     - japicc/               used to generate a compatibility report between optimized jar and normal one
-    - proguard.jar          optimize final binary jar - see build.xml (not used in production so far)
     - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml

trunk/build.xml

@@ -609 +609 @@
     </target>
     <target name="dist-optimized" depends="dist" unless="isJava11">
-        <taskdef resource="proguard/ant/task.properties" classpath="${tools.dir}/proguard.jar"/>
+        <ivy:cachepath file="${tools.ivy}" pathid="proguard.classpath" conf="proguard"/>
+        <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
         <proguard>
         -injars ${dist.jar}
@@ -951 +952 @@
     <target name="spotbugs" depends="dist">
         <ivy:cachepath file="${tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
-        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="spotbugs.classpath"/>
         <spotbugs output="xml"
                 outputFile="spotbugs-josm.xml"
@@ -967 +968 @@
     <target name="pmd" depends="init-properties">
         <ivy:cachepath file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
-        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
+        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
         <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
             <sourceLanguage name="java" version="${java.lang.version}" />

trunk/tools/ivy.xml

@@ -5 +5 @@
     <configurations>
         <conf name="javacc" description="Everything needed for running JavaCC"/>
+        <conf name="proguard" description="Everything needed for running ProGuard"/>
         <conf name="pmd" description="Everything needed for running PMD"/>
         <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
@@ -11 +12 @@
         <!-- javacc->default -->
         <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.3" conf="javacc->default"/>
+        <!-- proguard->default -->
+        <dependency org="net.sf.proguard" name="proguard-anttask" rev="6.0.3" conf="proguard->default"/>
         <!-- pmd->default -->
         <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.20.0" conf="pmd->default"/>