Changeset 18180 in josm


Ignore:
Timestamp:
2021-08-26T13:49:17+02:00 (3 years ago)
Author:
Don-vip
Message:

see #20522 - re-enable Proguard on Java 17+

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r18169 r18180  
    509509        </jacoco:report>
    510510    </target>
    511     <!-- ProGuard does not woth with Java 17 yet: https://github.com/Guardsquare/proguard/issues/132 -->
    512     <target name="dist-optimized" depends="dist" unless="isJava17" description="Build an optimized JOSM distribution file">
     511    <target name="dist-optimized" depends="dist" description="Build an optimized JOSM distribution file">
    513512        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="proguard.classpath" conf="proguard"/>
    514513        <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>

  • trunk/tools/ivy.xml

    r18129 r18180  
    1919        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="8.44" conf="checkstyle->default"/>
    2020        <!-- proguard->default -->
    21         <dependency org="com.guardsquare" name="proguard-ant" rev="7.1.1" conf="proguard->default"/>
     21        <dependency org="com.guardsquare" name="proguard-ant" rev="7.2.0-beta2" conf="proguard->default"/>
    2222        <!-- pmd->default -->
    2323        <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.