Skip to content

Commit

Permalink
4.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
micycle1 committed Feb 4, 2023
1 parent 7f415dc commit 4677c90
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is a mirror of the *core* library from [Processing 4](https://github.com/pr

It is hosted as a *Maven* dependency via [JitPack](https://jitpack.io/#micycle1/processing-core-4) (from this Github repository) so it can be referenced in your own *Maven* project (for when you want to use the Processing library outside of the Processing IDE).

This mirror is not necessarily up to date with the latest Processing 4 release; it is currently based on Processing [**4.1.1**](https://github.com/processing/processing4/releases/tag/processing-1289-4.1.1).
This mirror is not necessarily up to date with the latest Processing 4 release; it is currently based on Processing [**4.1.2**](https://github.com/processing/processing4/releases/tag/processing-1290-4.1.2).

---

Expand Down
71 changes: 47 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,26 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.processing</groupId>
<artifactId>core</artifactId>
<version>4.1.1</version>
<version>4.1.2</version>
<name>Processing Core</name>

<properties>
<sonar.projectKey>micycle1_processing-core-4</sonar.projectKey>
<sonar.organization>micycle</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
</properties>

<build>
<sourceDirectory>processing4\core\src</sourceDirectory>
<resources>
<resource>
<directory>processing4\core\src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>

<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>3.10.0</version>
<configuration>
<release>17</release>
<encoding>UTF-8</encoding>
<excludes>
<exclude>font/**</exclude>
<exclude>icon/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
Expand All @@ -47,12 +40,18 @@
<configuration>
<sources>
<source>processing4-javafx/src/</source>
<source>processing4/java/libraries/dxf/src/</source>
<source>processing4/java/libraries/io/src/</source>
<source>processing4/java/libraries/net/src/</source>
<source>processing4/java/libraries/pdf/src/</source>
<source>processing4/java/libraries/svg/src/</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <!-- Create sources.jar -->
<plugin>
<!-- Create sources.jar -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
Expand All @@ -65,7 +64,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand All @@ -84,7 +82,6 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>uber-jar</id>
Expand Down Expand Up @@ -124,23 +121,49 @@
</build>
</profile>
</profiles>

<repositories>
<repository>
<name>jogamp</name>
<id>jogamp</id>
<url>https://jogamp.org/deployment/maven/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>18.0.2</version>
<version>19.0.2.1</version>
</dependency>
<dependency>
<groupId>me.friwi</groupId>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>v2.4.0-rc-20210111</version>
<version>2.4.0-rc-20230123</version>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-main</artifactId>
<version>2.4.0-rc-20230123</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svggen</artifactId>
<version>1.16</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>1.16</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>me.friwi</groupId>
<artifactId>gluegen-rt</artifactId>
<version>v2.4.0-rc-20210111</version>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>2.1.7</version>
</dependency>
</dependencies>

</project>
2 changes: 1 addition & 1 deletion processing4
Submodule processing4 updated 44 files
+191 −345 app/src/processing/app/Base.java
+5 −2 app/src/processing/app/Mode.java
+9 −8 app/src/processing/app/Sketch.java
+3 −3 app/src/processing/app/contrib/ContribProgress.java
+6 −2 app/src/processing/app/contrib/Contribution.java
+128 −123 app/src/processing/app/contrib/ContributionListing.java
+27 −19 app/src/processing/app/contrib/ContributionManager.java
+80 −37 app/src/processing/app/contrib/ContributionTab.java
+71 −49 app/src/processing/app/contrib/ContributionType.java
+41 −48 app/src/processing/app/contrib/ExamplesContribution.java
+121 −94 app/src/processing/app/contrib/ListPanel.java
+123 −120 app/src/processing/app/contrib/LocalContribution.java
+36 −48 app/src/processing/app/contrib/ManagerFrame.java
+1 −1 app/src/processing/app/contrib/ModeContribution.java
+60 −32 app/src/processing/app/contrib/StatusDetail.java
+40 −55 app/src/processing/app/contrib/StatusPanel.java
+5 −11 app/src/processing/app/contrib/ToolContribution.java
+14 −14 app/src/processing/app/contrib/UpdateContributionTab.java
+6 −2 app/src/processing/app/contrib/UpdateListPanel.java
+31 −7 app/src/processing/app/contrib/UpdateStatusPanel.java
+21 −6 app/src/processing/app/ui/Editor.java
+3 −3 app/src/processing/app/ui/ExamplesFrame.java
+105 −127 app/src/processing/app/ui/FindReplace.java
+102 −49 app/src/processing/app/ui/Toolkit.java
+2 −1 build/build.xml
+1 −1 build/shared/lib/languages/PDE.properties
+ build/shared/lib/manager/loader.gif
+49 −0 build/shared/revisions.md
+10 −0 build/shared/tools/MovieMaker/tool.properties
+4 −0 core/done.txt
+13 −1 core/src/processing/awt/PGraphicsJava2D.java
+6 −2 core/src/processing/core/PGraphics.java
+5 −1 core/todo.txt
+4 −0 done.txt
+28 −7 java/src/processing/mode/java/ErrorChecker.java
+2 −2 java/src/processing/mode/java/JavaEditor.java
+29 −24 java/src/processing/mode/java/JavaProblem.java
+11 −20 java/src/processing/mode/java/PreprocService.java
+8 −14 java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+5 −0 java/test/processing/mode/java/ParserTests.java
+13 −0 java/test/resources/customrootclass.expected
+65 −0 java/test/resources/staticannotations.expected
+34 −0 java/test/resources/staticannotations.pde
+136 −48 todo.txt

0 comments on commit 4677c90

Please sign in to comment.