Remove ivy (no longer necessary)

Signed-off-by: Taylor Smock <tsmock@meta.com>
pull/4/head v1.9.18
Taylor Smock 2022-10-10 12:23:01 -06:00
rodzic 976f861309
commit ff3a9d38c3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
4 zmienionych plików z 1 dodań i 45 usunięć

Wyświetl plik

@ -13,6 +13,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.apache.ivyde.eclipse.ivynature</nature>
</natures>
</projectDescription>

Wyświetl plik

@ -69,16 +69,6 @@ configurations {
intTestImplementation.extendsFrom testImplementation
}
// Add dependencies from ivy.xml
def ivyModule = new XmlParser().parse(new File("$projectDir/ivy.xml"))
logger.info("Dependencies from ivy.xml (added to configuration `packIntoJar`):")
ivyModule.dependencies.dependency.each {
logger.info(" * ${it.@org}:${it.@name}:${it.@rev}")
if (!"${it.@conf}".contains("test")) {
project.dependencies.packIntoJar("${it.@org}:${it.@name}:${it.@rev}")
}
}
int getJavaVersion() {
// We want to use whatever Java version CI has as default
def ci = project.hasProperty("isCI") or project.hasProperty("CI") or System.getenv("CI") != null

Wyświetl plik

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="mapwithai" default="dist" basedir=".">
<project name="mapwithai" default="dist" basedir=".">
<property name="plugin.src.dir" value="src/main/java"/>
<property name="plugin.test.dir" value="src/test"/>
@ -24,31 +24,11 @@
</copy>
</target>
<property name="ivy.home" value="${user.home}/.ant"/>
<property name="ivy.jar.dir" value="${ivy.home}/lib"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
<include name="utilsplugin2.jar"/>
<include name="apache-http.jar"/>
</fileset>
<target name="download-ivy">
<mkdir dir="${ivy.jar.dir}"/>
<get src="https://jcenter.bintray.com/org/apache/ivy/ivy/2.5.0/ivy-2.5.0.jar" dest="${ivy.jar.file}" usetimestamp="true" ignoreerrors="true"/>
</target>
<target name="init-ivy" depends="download-ivy">
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
</target>
<target name="pre-compile" description="retrieve dependencies with Ivy" depends="init-ivy">
<ivy:retrieve/>
</target>
<target name="additional-manifest">
<manifest file="MANIFEST" mode="update">
<attribute name="17903_Plugin-Url" value="v1.8.7;https://github.com/JOSM/MapWithAI/releases/download/v1.8.7/mapwithai.jar" />

13
ivy.xml
Wyświetl plik

@ -1,13 +0,0 @@
<ivy-module version="2.0">
<info organisation="org.openstreetmap.josm.plugins" module="mapwithai"/>
<configurations>
<conf name="default" />
<conf name="compile" />
<conf name="runtime" extends="compile" />
<conf name="test" extends="runtime" />
</configurations>
<dependencies>
<dependency org="org.junit.jupiter" name="junit-jupiter" rev="5.8.2" conf="test->default" />
<dependency org="org.awaitility" name="awaitility" rev="4.1.1" conf="test->default" />
</dependencies>
</ivy-module>