Skip to content

Commit ac9b736

Browse files
mikebarkminmikebarkmin
committed
update dependencies
1 parent 505ccc1 commit ac9b736

20 files changed

Lines changed: 189 additions & 152 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.vscode
21
!examples/**/.vscode
32
.idea
43
.settings

‎.vscode/extensions.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"redhat.java",
4+
"openpatch.hyperbook-studio"
5+
]
6+
}

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"hyperbook.root": "docs"
3+
}

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ index: 4
44
lang: en
55
---
66

7+
## 4.13.0
8+
9+
- Update dependencies
10+
- Processing 4.3.1
11+
- Jackson 2.18.2
12+
- Jogl 2.5.0
13+
- Gluegen 2.5.0
14+
- Add template for VSCode
15+
716
## 4.12.0
817

918
- 🚀 Feat: There is a new color extension providing a color class and all named HTML colors for easy reference.

‎docs/de/book/installation.md‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,33 @@ lang: de
66

77
# Installation
88

9-
## BlueJ
9+
## VS Code (Empfohlen)
1010

11-
Du kannst die Bibliothek auf drei verschiedene Arten installieren.
11+
Stelle zunächst sicher, dass du das Java Extension Pack installiert hast. Du findest es in der Erweiterungsansicht, indem du nach `redhat.java` suchst.
1212

13-
Als Erstes musst du dir die Scratch for Java jar-Datei für dein Betriebssystem herunterladen.
13+
Dann musst du die Scratch for Java jar für dein [Betriebssystem](#downloads) herunterladen.
1414

15-
::download[Windows - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-windows-amd64.jar"}
15+
Anschließend musst du die jar zu deinem Projekt hinzufügen. Du kannst dies tun, indem du Folgendes zu deiner `settings.json` hinzufügst:
1616

17-
::download[Linux - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-linux-amd64.jar"}
17+
```json
18+
"java.project.referencedLibraries": [
19+
"path/to/scratch4j.jar"
20+
]
21+
```
1822

19-
::download[Linux - ARM 32-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-linux-arm.jar"}
23+
Wenn du mit BlueJ kompatibel sein möchtest, solltest du einen "+libs"-Ordner in deinem Projekt verwenden, die jar dort hinzufügen und dann Folgendes zu deiner `settings.json` hinzufügen:
2024

21-
::download[Linux - ARM 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-linux-aarch64.jar"}
25+
```json
26+
"java.project.referencedLibraries": [
27+
"+libs/*.jar"
28+
]
29+
```
2230

23-
::download[MacOS - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-macos-x86_64.jar"}
31+
## BlueJ
2432

25-
::download[MacOS - Apple Silicon]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-macos-aarch64.jar"}
33+
Du kannst die Bibliothek auf drei verschiedene Arten installieren.
34+
35+
Als Erstes musst du dir die Scratch for Java jar-Datei für dein [Betriebssystem](#downloads) herunterladen.
2636

2737
### Für ein einzelnes Projekt
2838

@@ -44,7 +54,9 @@ Wenn du BlueJ installiert hast, findest du den "userlib"-Ordner hier:
4454

4555
## Eigenständig
4656

47-
Du kannst die Jar-Datei auch deinme classpath hinzufügen und so unabhängig von BlueJ mit deinem Lieblingseditor verwenden
57+
Du kannst die Jar-Datei auch deinme classpath hinzufügen und so unabhängig von BlueJ mit deinem Lieblingseditor verwenden.
58+
59+
## Downloads
4860

4961
::download[Windows - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-windows-amd64.jar"}
5062

‎docs/en/book/installation.md‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,33 @@ index: 1
55

66
# Installation
77

8-
## BlueJ
8+
## VS Code (Recommended)
99

10-
You can install this library via three ways in BlueJ.
10+
First make sure you have the Java Extension Pack installed. You can find it in the Extensions view by searching for `redhat.java`.
1111

12-
First, you need to download the Scratch for Java jar for your operating system.
12+
Then you need to download the Scratch for Java jar for your [operating system](#downloads).
1313

14-
::download[Windows - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-windows-amd64.jar"}
14+
Afterward, you need to add the jar to your project. You can do this by adding the following to your `settings.json`:
1515

16-
::download[Linux - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-linux-amd64.jar"}
16+
```json
17+
"java.project.referencedLibraries": [
18+
"path/to/scratch4j.jar"
19+
]
20+
```
1721

18-
::download[Linux - ARM 32-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-linux-arm.jar"}
22+
If you want to be compatible with BlueJ you should use a "+libs" folder in your project, add the jar there and then add the following to your `settings.json`:
1923

20-
::download[Linux - ARM 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-linux-aarch64.jar"}
24+
```json
25+
"java.project.referencedLibraries": [
26+
"+libs/*.jar"
27+
]
28+
```
2129

22-
::download[MacOS - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-macos-x86_64.jar"}
30+
## BlueJ
2331

24-
::download[MacOS - Apple Silicon]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-macos-aarch64.jar"}
32+
You can install this library via three ways in BlueJ.
33+
34+
First, you need to download the Scratch for Java jar for your [operating system](#downloads).
2535

2636
### Project-by-project
2737

@@ -43,7 +53,9 @@ If you have installed BlueJ via the installer you probably find the "userlib" fo
4353

4454
## Standalone
4555

46-
You need to add the Jar file for your operating system to the classpath.
56+
You need to add the Jar file for your [operating system](#downloads) to the classpath.
57+
58+
## Downloads
4759

4860
::download[Windows - Intel 64-bit]{src="https://github.com/openpatch/scratch-for-java/releases/latest/download/scratch4j-windows-amd64.jar"}
4961

‎resources/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ author.url=https://openpatch.org
4040
# This is NOT a direct link to where to download it.
4141

4242
library.url=https://github.com/openpatch/scratch-for-java
43-
library.version=4.12.0
43+
library.version=4.13.0
4444

4545

4646
# Set the category (or categories) of your Library from the following list:

‎resources/build.xml‎

Lines changed: 35 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<os family="unix" />
4141
</condition>
4242

43+
<property name="libs.processing" value="4.3.1" />
44+
<property name="libs.gluegen-rt" value="2.5.0" />
45+
<property name="libs.jogl-all" value="2.5.0" />
46+
<property name="libs.jackson" value="2.18.2" />
47+
4348

4449
<property name="project.jar.name" value="${project.name}" />
4550
<property name="project.src" location="src" />
@@ -88,10 +93,9 @@
8893
<mkdir dir="${project.bin}" />
8994
<mkdir dir="${project.libs}" />
9095
<mkdir dir="${project.libs}/windows-amd64" />
91-
<mkdir dir="${project.libs}/macos-x86_64" />
92-
<mkdir dir="${project.libs}/macos-aarch64" />
96+
<mkdir dir="${project.libs}/macosx-universal" />
9397
<mkdir dir="${project.libs}/linux-amd64" />
94-
<mkdir dir="${project.libs}/linux-arm" />
98+
<mkdir dir="${project.libs}/linux-armv6hf" />
9599
<mkdir dir="${project.libs}/linux-aarch64" />
96100
</target>
97101

@@ -102,23 +106,23 @@
102106
<echo message="download dependencies ..." />
103107

104108
<property name="jogl.url"
105-
value="https://download.processing.org/jogl/v2.4.0-rc-20210111y" />
109+
value="https://jogamp.org/deployment/maven/org/jogamp" />
110+
<property name="gluegen-rt.url" value="${jogl.url}/gluegen/gluegen-rt/${libs.gluegen-rt}" />
111+
<property name="jogl-all.url" value="${jogl.url}/jogl/jogl-all/${libs.jogl-all}" />
106112

107113
<get dest="${project.libs}" skipexisting="true">
108114
<url
109-
url="https://github.com/micycle1/processing-core-4/releases/download/4.2.1/core-4.2.1.jar" />
110-
<url url="${jogl.url}/gluegen-rt.jar" />
111-
<url url="${jogl.url}/jogl-all.jar" />
115+
url="https://repo1.maven.org/maven2/org/processing/core/${libs.processing}/core-${libs.processing}.jar" />
116+
<url url="${gluegen-rt.url}/gluegen-rt-${libs.gluegen-rt}.jar" />
117+
<url url="${jogl-all.url}/jogl-all-${libs.jogl-all}.jar" />
112118
<url
113119
url="https://github.com/processing/processing-sound/releases/download/v2.4.0/sound.zip" />
114-
<url url="https://github.com/java-native/jssc/releases/download/v2.9.4/jssc-2.9.4.jar" />
115-
<url url="https://repo1.maven.org/maven2/org/processing/serial/3.3.7/serial-3.3.7.jar" />
116120

117121
<!-- Jackson for JSON and XML loading -->
118-
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar" />
119-
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.2/jackson-annotations-2.15.2.jar" />
120-
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.jar" />
121-
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.15.2/jackson-dataformat-xml-2.15.2.jar" />
122+
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/${libs.jackson}/jackson-core-${libs.jackson}.jar" />
123+
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/${libs.jackson}/jackson-annotations-${libs.jackson}.jar" />
124+
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/${libs.jackson}/jackson-databind-${libs.jackson}.jar" />
125+
<url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/${libs.jackson}/jackson-dataformat-xml-${libs.jackson}.jar" />
122126
<url url="https://repo1.maven.org/maven2/com/fasterxml/woodstox/woodstox-core/6.5.1/woodstox-core-6.5.1.jar" />
123127
<url url="https://repo1.maven.org/maven2/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.jar" />
124128

@@ -129,43 +133,28 @@
129133
</get>
130134

131135
<get dest="${project.libs}/linux-amd64" skipexisting="true">
132-
<url url="${jogl.url}/gluegen-rt-natives-linux-amd64.jar" />
133-
<url url="${jogl.url}/jogl-all-natives-linux-amd64.jar" />
136+
<url url="${gluegen-rt.url}/gluegen-rt-${libs.gluegen-rt}-natives-linux-amd64.jar" />
137+
<url url="${jogl-all.url}/jogl-all-${libs.jogl-all}-natives-linux-amd64.jar" />
134138
</get>
135139

136-
<get dest="${project.libs}/linux-arm" skipexisting="true">
137-
<url
138-
url="${jogl.url}/gluegen-rt-natives-linux-arm.jar" />
139-
<url
140-
url="${jogl.url}/jogl-all-natives-linux-arm.jar" />
140+
<get dest="${project.libs}/linux-armv6hf" skipexisting="true">
141+
<url url="${gluegen-rt.url}/gluegen-rt-${libs.gluegen-rt}-natives-linux-armv6hf.jar" />
142+
<url url="${jogl-all.url}/jogl-all-${libs.jogl-all}-natives-linux-armv6hf.jar" />
141143
</get>
142144

143145
<get dest="${project.libs}/linux-aarch64" skipexisting="true">
144-
<url
145-
url="${jogl.url}/gluegen-rt-natives-linux-aarch64.jar" />
146-
<url
147-
url="${jogl.url}/jogl-all-natives-linux-aarch64.jar" />
146+
<url url="${gluegen-rt.url}/gluegen-rt-${libs.gluegen-rt}-natives-linux-aarch64.jar" />
147+
<url url="${jogl-all.url}/jogl-all-${libs.jogl-all}-natives-linux-aarch64.jar" />
148148
</get>
149149

150150
<get dest="${project.libs}/windows-amd64" skipexisting="true">
151-
<url
152-
url="${jogl.url}/gluegen-rt-natives-windows-amd64.jar" />
153-
<url
154-
url="${jogl.url}/jogl-all-natives-windows-amd64.jar" />
151+
<url url="${gluegen-rt.url}/gluegen-rt-${libs.gluegen-rt}-natives-windows-amd64.jar" />
152+
<url url="${jogl-all.url}/jogl-all-${libs.jogl-all}-natives-windows-amd64.jar" />
155153
</get>
156154

157-
<get dest="${project.libs}/macos-x86_64" skipexisting="true">
158-
<url
159-
url="${jogl.url}/gluegen-rt-natives-macos-x86_64.jar" />
160-
<url
161-
url="${jogl.url}/jogl-all-natives-macos-x86_64.jar" />
162-
</get>
163-
164-
<get dest="${project.libs}/macos-aarch64" skipexisting="true">
165-
<url
166-
url="${jogl.url}/gluegen-rt-natives-macos-aarch64.jar" />
167-
<url
168-
url="${jogl.url}/jogl-all-natives-macos-aarch64.jar" />
155+
<get dest="${project.libs}/macosx-universal" skipexisting="true">
156+
<url url="${gluegen-rt.url}/gluegen-rt-${libs.gluegen-rt}-natives-macosx-universal.jar" />
157+
<url url="${jogl-all.url}/jogl-all-${libs.jogl-all}-natives-macosx-universal.jar" />
169158
</get>
170159

171160
<if>
@@ -256,7 +245,6 @@
256245
<jar
257246
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-linux-amd64.jar"
258247
basedir="${project.bin}">
259-
<fileset dir="${project.dist}/javadoc" />
260248
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
261249
<zipgroupfileset dir="${project.libs}/linux-amd64" includes="*.jar" />
262250
<manifest>
@@ -269,11 +257,10 @@
269257
</jar>
270258

271259
<jar
272-
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-linux-arm.jar"
260+
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-linux-armv6hf.jar"
273261
basedir="${project.bin}">
274-
<fileset dir="${project.dist}/javadoc" />
275262
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
276-
<zipgroupfileset dir="${project.libs}/linux-arm" includes="*.jar" />
263+
<zipgroupfileset dir="${project.libs}/linux-armv6hf" includes="*.jar" />
277264
<manifest>
278265
<attribute name="Class-Path" value="${project.libs}" />
279266
<!-- Information about the program itself -->
@@ -286,7 +273,6 @@
286273
<jar
287274
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-linux-aarch64.jar"
288275
basedir="${project.bin}">
289-
<fileset dir="${project.dist}/javadoc" />
290276
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
291277
<zipgroupfileset dir="${project.libs}/linux-aarch64" includes="*.jar" />
292278
<manifest>
@@ -313,10 +299,10 @@
313299
</jar>
314300

315301
<jar
316-
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-x86_64.jar"
302+
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macosx-universal.jar"
317303
basedir="${project.bin}">
318304
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
319-
<zipgroupfileset dir="${project.libs}/macos-x86_64" includes="*.jar" />
305+
<zipgroupfileset dir="${project.libs}/macosx-universal" includes="*.jar" />
320306
<manifest>
321307
<attribute name="Class-Path" value="${project.libs}" />
322308
<!-- Information about the program itself -->
@@ -326,19 +312,6 @@
326312
</manifest>
327313
</jar>
328314

329-
<jar
330-
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-aarch64.jar"
331-
basedir="${project.bin}">
332-
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
333-
<zipgroupfileset dir="${project.libs}/macos-aarch64" includes="*.jar" />
334-
<manifest>
335-
<attribute name="Class-Path" value="${project.libs}" />
336-
<!-- Information about the program itself -->
337-
<attribute name="Implementation-Vendor" value="${author.name}" />
338-
<attribute name="Implementation-Title" value="${project.prettyName}" />
339-
<attribute name="Implementation-Version" value="${library.version}" />
340-
</manifest>
341-
</jar>
342315
</target>
343316

344317

@@ -380,16 +353,13 @@
380353
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-linux-amd64.jar"
381354
todir="${project.dist}" />
382355
<move
383-
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-linux-arm.jar"
356+
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-linux-armv6hf.jar"
384357
todir="${project.dist}" />
385358
<move
386359
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-linux-aarch64.jar"
387360
todir="${project.dist}" />
388361
<move
389-
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-x86_64.jar"
390-
todir="${project.dist}" />
391-
<move
392-
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-aarch64.jar"
362+
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macosx-universal.jar"
393363
todir="${project.dist}" />
394364

395365
<copy file="resources/index.html" todir="${project.dist}" />

0 commit comments

Comments
 (0)