From 8424cbf4fb807465e77f16404533beeceaee2344 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sat, 26 Nov 2022 12:30:27 -0500
Subject: [PATCH] rolling back non-source changes from 4f21049

---
 app/build.xml           |  2 +-
 app/processing4-app.iml |  2 +-
 build/build.xml         |  5 -----
 java/.gitignore         |  1 -
 java/build.xml          | 41 +++--------------------------------------
 java/ivy.xml            |  7 -------
 java/lib/.gitignore     |  1 -
 7 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 java/ivy.xml
 delete mode 100644 java/lib/.gitignore

diff --git a/app/build.xml b/app/build.xml
index 52b8e07b9..c48adeb02 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -181,8 +181,8 @@
 
     <!--
     <antcall target="download-ant" />
-    <antcall target="download-jna" />
     <antcall target="download-flatlaf" />
+    <antcall target="download-jna" />
     -->
   </target>
 
diff --git a/app/processing4-app.iml b/app/processing4-app.iml
index e2df2c5b2..62e9a8c3a 100644
--- a/app/processing4-app.iml
+++ b/app/processing4-app.iml
@@ -65,4 +65,4 @@
       </library>
     </orderEntry>
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index d2dbc11e8..38250dc49 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -377,11 +377,6 @@
         <include name="theme/**" />
       </fileset>
     </copy>
-    <copy todir="${target.path}/modes/java/mode" preservelastmodified="true">
-      <fileset dir="../java/lib">
-        <include name="**/*.jar" />
-      </fileset>
-    </copy>
 
     <!-- get the examples folder, but don't require it to buid -->
     <copy todir="${target.path}/modes/java/examples"
diff --git a/java/.gitignore b/java/.gitignore
index 6e0739560..4eecb6de1 100644
--- a/java/.gitignore
+++ b/java/.gitignore
@@ -3,4 +3,3 @@ bin
 bin-test
 generated
 mode/JavaMode.jar
-ivy.jar
diff --git a/java/build.xml b/java/build.xml
index a5f4fe690..1a5bcdfd8 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Java Mode" default="build" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="Java Mode" default="build">
 
   <property name="generated"
 	    value="${basedir}/generated/processing/mode/java/preproc" />
@@ -18,34 +18,6 @@
     <classpath path="${antlr_jar}" />
   </classloader>
 
-  <property name="ivy.version" value="2.5.0" />
-  <fileset id="ivy.files" dir="lib">
-    <include name="ivy.jar" />
-  </fileset>
-  <property name="ivy.url"
-            value="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
-
-  <available file="ivy.jar" property="ivy.present" />
-
-  <condition property="ivy.ignorable" value="false" else="true">
-    <isset property="ivy.present" />
-  </condition>
-
-  <target name="download-ivy" unless="ivy.present">
-    <get src="${ivy.url}" dest="ivy.jar"
-         ignoreerrors="${ivy.ignorable}"
-         usetimestamp="true" />
-  </target>
-
-  <target name="init-ivy" depends="download-ivy">
-    <taskdef resource="org/apache/ivy/ant/antlib.xml"
-        uri="antlib:org.apache.ivy.ant" classpath="ivy.jar"/>
-  </target>
-
-  <target name="download-ivy-dependencies" depends="init-ivy">
-    <ivy:retrieve />
-  </target>
-
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete dir="bin-test" />
@@ -60,11 +32,6 @@
 	<include name="*.properties" />
       </fileset>
     </delete>
-    <delete>
-      <fileset dir="lib">
-	      <include name="*.jar" />
-      </fileset>
-    </delete>
   </target>
 
   <target name="preproc" description="Compile ANTLR 4 grammar">
@@ -104,8 +71,6 @@
     <pathelement location="mode/org.eclipse.jdt.core.jar" />
     <pathelement location="mode/org.eclipse.osgi.jar" />
     <pathelement location="mode/org.eclipse.text.jar" />
-    <pathelement location="mode/org.eclipse.ui.workbench.jar" />
-    <fileset dir="lib" includes="*.jar" />
   </path>
 
   <path id="classpath.test">
@@ -158,7 +123,7 @@
     </sequential>
   </macrodef>
 
-  <target name="test-compile" depends="preproc, download-ivy-dependencies">
+  <target name="test-compile" depends="preproc">
     <compilecommon srcdir="src; test/processing" destdir="bin-test" classpath="classpath.test" />
   </target>
 
@@ -175,7 +140,7 @@
     </junit>
   </target>
 
-  <target name="compile" description="Compile sources" depends="preproc, download-ivy-dependencies">
+  <target name="compile" description="Compile sources" depends="preproc">
     <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
 
diff --git a/java/ivy.xml b/java/ivy.xml
deleted file mode 100644
index 68bc5a354..000000000
--- a/java/ivy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0">
-    <info organisation="" module="" />
-    <dependencies>
-        <dependency org="org.eclipse.lsp4j" name="org.eclipse.lsp4j" rev="0.12.0"/>
-    </dependencies>
-</ivy-module>
diff --git a/java/lib/.gitignore b/java/lib/.gitignore
deleted file mode 100644
index d392f0e82..000000000
--- a/java/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar