Changeset 16169 in josm


Ignore:
Timestamp:
2020-03-17T22:41:28+01:00 (2 years ago)
Author:
simon04
Message:

see #16860 - Resolve ProGuard using Apache Ivy

Location:
trunk
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

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

    r16168 r16169  
    609609    </target>
    610610    <target name="dist-optimized" depends="dist" unless="isJava11">
    611         <taskdef resource="proguard/ant/task.properties" classpath="${tools.dir}/proguard.jar"/>
     611        <ivy:cachepath file="${tools.ivy}" pathid="proguard.classpath" conf="proguard"/>
     612        <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
    612613        <proguard>
    613614        -injars ${dist.jar}
     
    951952    <target name="spotbugs" depends="dist">
    952953        <ivy:cachepath file="${tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
    953         <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
     954        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="spotbugs.classpath"/>
    954955        <spotbugs output="xml"
    955956                outputFile="spotbugs-josm.xml"
     
    967968    <target name="pmd" depends="init-properties">
    968969        <ivy:cachepath file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
    969         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
     970        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
    970971        <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
    971972            <sourceLanguage name="java" version="${java.lang.version}" />
  • trunk/tools/ivy.xml

    r16168 r16169  
    55    <configurations>
    66        <conf name="javacc" description="Everything needed for running JavaCC"/>
     7        <conf name="proguard" description="Everything needed for running ProGuard"/>
    78        <conf name="pmd" description="Everything needed for running PMD"/>
    89        <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
     
    1112        <!-- javacc->default -->
    1213        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.3" conf="javacc->default"/>
     14        <!-- proguard->default -->
     15        <dependency org="net.sf.proguard" name="proguard-anttask" rev="6.0.3" conf="proguard->default"/>
    1316        <!-- pmd->default -->
    1417        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.20.0" conf="pmd->default"/>
Note: See TracChangeset for help on using the changeset viewer.