From 2c562c69f77a954eb3ed0e7090050a7074f692a6 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Mon, 7 Oct 2019 20:09:53 -0400
Subject: [PATCH] trying to sort out build failures in Eclipse

---
 app/.classpath  |  8 ++++++--
 java/.classpath | 15 +++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/.classpath b/app/.classpath
index 62372c610..96cab9ff6 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 11 [11.0.4]"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 11 [11.0.4]">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/jna-platform.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
-	<classpathentry kind="lib" path="/processing-core/apple.jar"/>
+	<classpathentry kind="lib" path="/processing4-core/apple.jar"/>
 	<classpathentry kind="lib" path="/processing4-core/library-test/junit-4.8.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/.classpath b/java/.classpath
index 8883e472b..84c6ef574 100644
--- a/java/.classpath
+++ b/java/.classpath
@@ -2,11 +2,16 @@
 <classpath>
 	<classpathentry kind="src" path="generated"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 11 [11.0.4]">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="mode/antlr-4.7.2-complete.jar"/>
 	<classpathentry kind="lib" path="mode/classpath-explorer-1.0.jar"/>
 	<classpathentry kind="lib" path="mode/com.ibm.icu.jar"/>
-	<classpathentry kind="lib" path="mode/jdi.jar"/>
-	<classpathentry kind="lib" path="mode/jdimodel.jar"/>
 	<classpathentry kind="lib" path="mode/jdtCompilerAdapter.jar"/>
 	<classpathentry kind="lib" path="mode/jsoup-1.7.1.jar"/>
 	<classpathentry kind="lib" path="mode/org.eclipse.core.contenttype.jar"/>
@@ -20,9 +25,7 @@
 	<classpathentry kind="lib" path="mode/org.eclipse.text.jar"/>
 	<classpathentry kind="lib" path="mode/org.netbeans.swing.outline.jar"/>
 	<classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 11 [11.0.4]"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
+	<classpathentry kind="lib" path="mode/jdi.jar"/>
+	<classpathentry kind="lib" path="mode/jdimodel.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>