Merge branch 'processing:main' into main

Stefterv · web-flow · commit c75e95676030 · 2025-10-14T15:36:02.000+02:00
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
@@ -68,7 +68,7 @@ tasks.register<Copy>("copyCore"){
     into(coreProject.layout.projectDirectory.dir("library"))
 }
 
-val legacyLibraries = arrayOf("dxf","io","net","serial","svg")
+val legacyLibraries = arrayOf("io","net","svg")
 legacyLibraries.forEach { library ->
     tasks.register<Copy>("library-$library-extraResources"){
         val build = project(":java:libraries:$library").tasks.named("build")
@@ -87,7 +87,7 @@ legacyLibraries.forEach { library ->
     }
 }
 
-val libraries = arrayOf("dxf", "pdf")
+val libraries = arrayOf("dxf", "pdf", "serial")
 
 libraries.forEach { library ->
     val name = "create-$library-library"
diff --git a/java/keywords.txt b/java/keywords.txt
@@ -251,6 +251,7 @@ double	KEYWORD5	double
 float	KEYWORD5	float
 int	KEYWORD5	int
 long	KEYWORD5	long
+short	KEYWORD5	short
 var	KEYWORD5
 
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ tasks.register<Copy>("copyCore"){`
`68`	`68`	`into(coreProject.layout.projectDirectory.dir("library"))`
`69`	`69`	`}`
`70`	`70`
`71`		`-val legacyLibraries = arrayOf("dxf","io","net","serial","svg")`
	`71`	`+val legacyLibraries = arrayOf("io","net","svg")`
`72`	`72`	`legacyLibraries.forEach { library ->`
`73`	`73`	`tasks.register<Copy>("library-$library-extraResources"){`
`74`	`74`	`val build = project(":java:libraries:$library").tasks.named("build")`
`@@ -87,7 +87,7 @@ legacyLibraries.forEach { library ->`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-val libraries = arrayOf("dxf", "pdf")`
	`90`	`+val libraries = arrayOf("dxf", "pdf", "serial")`
`91`	`91`
`92`	`92`	`libraries.forEach { library ->`
`93`	`93`	`val name = "create-$library-library"`