Merge pull request #682 from processing/processing4

Bringing in Processing 4-changes

Author: codeanticode

build.gradle

@@ -115,9 +115,12 @@ task dist {
         FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))        
         FileUtils.copyDirectory(file("mode/theme"), file("${root}/theme"))
         FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
+        delete "${root}/mode/core.jar"
+        delete "${root}/mode/pde.jar"
+        delete "${root}/mode/JavaMode.jar"
         delete "${root}/mode/jdi.jar"
         delete "${root}/mode/jdimodel.jar"
-                   
+
         Files.copy(file("mode/processing-core.zip").toPath(),
                    file("${root}/processing-core.zip").toPath(), REPLACE_EXISTING)
 

mode/.classpath

@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-app"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="mode/jdi.jar"/>
-	<classpathentry kind="lib" path="mode/gradle-tooling-api-6.7.1.jar"/>
 	<classpathentry kind="lib" path="mode/jdimodel.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing4-java"/>
+	<classpathentry kind="lib" path="mode/istack-commons-runtime.jar"/>
+	<classpathentry kind="lib" path="mode/javax.activation-api.jar"/>
+	<classpathentry kind="lib" path="mode/jaxb-api.jar"/>
+	<classpathentry kind="lib" path="mode/jaxb-jxc.jar"/>
+	<classpathentry kind="lib" path="mode/jaxb-runtime.jar"/>
+	<classpathentry kind="lib" path="mode/jaxb-xjc.jar"/>
+	<classpathentry kind="lib" path="mode/gradle-tooling-api-6.8.3.jar"/>
+	<classpathentry kind="var" path="ANDROID_JAR"/>
+	<classpathentry kind="var" path="ANDROID_SDK"/>
 	<classpathentry kind="output" path="core/bin"/>
 </classpath>

mode/build.gradle

@@ -12,17 +12,17 @@ configurations {
 }
 
 dependencies {
-    implementation group: "org.processing", name: "core", version: "${processingVersion}"
-    implementation group: "org.processing", name: "pde", version: "${processingVersion}"
-    implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
+    // implementation group: "org.processing", name: "core", version: "${processingVersion}"
+    // implementation group: "org.processing", name: "pde", version: "${processingVersion}"
+    // implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
 
     implementationExtract "org.eclipse.jdt:org.eclipse.jdt.debug:${jdtVersion}"
 
     implementationCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
     implementationCopy "org.slf4j:slf4j-api:${slf4jVersion}"
     implementationCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
 
-    implementation fileTree(include: ["jdi.jar", "jdimodel.jar"], dir: 'mode')
+    implementation fileTree(include: ["jdi.jar", "jdimodel.jar", "core.jar", "pde.jar", "JavaMode.jar"], dir: 'mode')
 }
 
 // This task copies the gradle tooling jar into the mode folder
@@ -85,6 +85,18 @@ clean.doFirst {
         exclude "jaxb-jxc.jar"
         exclude "jaxb-runtime.jar"
         exclude "jaxb-xjc.jar"
+        exclude "core.jar"
+        exclude "pde.jar"
+        exclude "JavaMode.jar"
+        exclude "org.eclipse.core.contenttype.jar"
+        exclude "org.eclipse.core.jobs.jar"
+        exclude "org.eclipse.core.resources.jar"
+        exclude "org.eclipse.core.runtime.jar"
+        exclude "org.eclipse.equinox.common.jar"
+        exclude "org.eclipse.equinox.preferences.jar"
+        exclude "org.eclipse.jdt.core.jar"
+        exclude "org.eclipse.osgi.jar"
+        exclude "org.eclipse.text.jar"
     }
 }
 

mode/mode.properties

@@ -1,10 +1,11 @@
-name = Android Mode for Processing 3
+name = Android Mode for Processing 4
 authorList = [The Processing Foundation](https://processingfoundation.org/)
 url = http://android.processing.org
 sentence = This mode lets you use Processing to create Android apps
 paragraph =
 imports=processing.mode.java.JavaMode
-version = 280
-prettyVersion = 4.3.0
-minRevision = 249
-maxRevision = 270
+version = 402
+prettyVersion = 4.5.0b1
+minRevision = 1276
+maxRevision = 0
+