Ignore:
Timestamp:
2022-11-14T19:49:21+01:00 (3 years ago)
Author:
taylor.smock
Message:

Dependency updates

apache-commons:

  • zstd-jni: 1.5.2-3 -> 1.5.2-5
  • commons-compress: 1.21 -> 1.22
  • commons-text: 1.9 -> 1.10.0

flatlaf: 1.6.1 -> 2.6
javafx: 16 -> 19
log4j: 2.18.0 -> 2.19.0

MicrosoftStreetside:

  • Enable builds on systems without JavaFX
  • Remove dependencies that exist in other plugins
    • jackson-core


pbf: 3.13.0 -> 3.20.3
jackson: 2.13.3 -> 2.14.0
lwjgl: joml 1.10.3 -> 1.10.5

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/MicrosoftStreetside/build.xml

    r34772 r36034  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <project name="MicrosoftStreetside" default="dist" basedir="." xmlns:if="ant:if">
    3 
    4     <!-- Configure these properties (replace "..." accordingly).
     2<project xmlns:if="ant:if" xmlns:ivy="antlib:org.apache.ivy.ant" name="MicrosoftStreetside" default="dist" basedir=".">
     3  <!-- Configure these properties (replace "..." accordingly).
    54             See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    65         -->
    7     <!-- enter the SVN commit message -->
    8     <property name="commit.message" value="Commit message" />
    9 
    10     <!-- edit the properties of this plugin in the file `gradle.properties` -->
    11     <property file="${basedir}/gradle.properties"/>
    12 
    13     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    14     <property name="plugin.dist.dir" value="../../dist"/>
    15 
    16     <!--** include targets that all plugins have in common **-->
    17     <import file="../build-common.xml"/>
    18 
    19     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
    20         <include name="apache-commons.jar"/>
    21         <include name="apache-http.jar"/>
    22         <include name="utilsplugin2.jar"/>
    23         <include name="javafx-windows.jar" if:set="isWindows"/>
    24         <include name="javafx-unixoid.jar" if:set="isUnix"/>
    25         <include name="javafx-osx.jar" if:set="isMac"/>
    26     </fileset>
    27 
    28     <target name="pre-compile" depends="fetch_dependencies">
    29         <!-- include fetch_dependencies task -->
    30     </target>
    31 
    32     <target name="install-plugin" depends="clean, dist, install">
    33         <echo>Installed Microsoft Streetside plugin</echo>
    34     </target>
    35 
    36     <target name="test-run" depends="install-plugin, runjosm">
    37     </target>
     6  <!-- enter the SVN commit message -->
     7  <property name="commit.message" value="Commit message"/>
     8  <!-- edit the properties of this plugin in the file `gradle.properties` -->
     9  <property file="${basedir}/gradle.properties"/>
     10  <property name="josm" location="../../core/dist/josm-custom.jar"/>
     11  <property name="plugin.dist.dir" value="../../dist"/>
     12  <!--** include targets that all plugins have in common **-->
     13  <import file="../build-common.xml"/>
     14  <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
     15    <include name="apache-commons.jar"/>
     16    <include name="apache-http.jar"/>
     17    <include name="jackson.jar"/>
     18    <include name="javafx-osx.jar" if:set="isMac"/>
     19    <include name="javafx-unixoid.jar" if:set="isUnix"/>
     20    <include name="javafx-windows.jar" if:set="isWindows"/>
     21    <include name="log4j.jar"/>
     22    <include name="utilsplugin2.jar"/>
     23  </fileset>
     24  <target name="pre-compile" depends="fetch_dependencies">
     25    <!-- include fetch_dependencies task -->
     26    <ivy:retrieve conf="provided,default"/>
     27    <!--<ivy:cachepath pathid="compile.path" conf="default,provided"/>-->
     28  </target>
     29  <target name="build-jar">
     30    <ivy:resolve/>
     31    <ivy:cachefileset setid="ivy.default.path" conf="default"/>
     32    <jar destfile="${basedir}/dependencies.jar" duplicate="preserve" level="0">
     33      <zipgroupfileset refid="ivy.default.path"/>
     34    </jar>
     35    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="${manifest}" manifestencoding="UTF-8" duplicate="preserve" level="9" excludes="${basedir}/dependencies.jar">
     36      <zipfileset src="${basedir}/dependencies.jar" excludes="META-INF/maven/* META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE META-INF/*.RSA META-INF/*.SF module-info.class"/>
     37    </jar>
     38    <delete file="${basedir}/dependencies.jar"/>
     39  </target>
    3840</project>
Note: See TracChangeset for help on using the changeset viewer.