Merge branch 'main' into gradle-publishing

Author: Stefterv

core/src/processing/core/PGraphics.java

@@ -4768,7 +4768,7 @@ public void text(char[] chars, int start, int stop, float x, float y) {
     }
 
 //    int start = 0;
-    int index = 0;
+    int index = start;
     while (index < stop) { //length) {
       if (chars[index] == '\n') {
         textLineAlignImpl(chars, start, index, x, y);

java/gradle/build.gradle.kts

@@ -48,4 +48,17 @@ publishing{
 val testGroup = group.toString()
 tasks.withType<Test>().configureEach {
     systemProperty("project.group", testGroup)
+}
+
+tasks.register("writeVersion") {
+    // make the version available to the plugin at runtime by writing it to a properties file in the resources directory
+    doLast {
+        val file = layout.buildDirectory.file("resources/main/version.properties").get().asFile
+        file.parentFile.mkdirs()
+        file.writeText("version=${project.version}")
+    }
+}
+
+tasks.named("processResources") {
+    dependsOn("writeVersion")
 }

java/gradle/src/main/kotlin/ProcessingPlugin.kt

@@ -20,7 +20,10 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val sketchName = project.layout.projectDirectory.asFile.name.replace(Regex("[^a-zA-Z0-9_]"), "_")
 
         val isProcessing = project.findProperty("processing.version") != null
-        val processingVersion = project.findProperty("processing.version") as String? ?: "4.3.4"
+        val processingVersion = project.findProperty("processing.version") as String?
+            ?: javaClass.classLoader.getResourceAsStream("version.properties")?.use { stream ->
+                java.util.Properties().apply { load(stream) }.getProperty("version")
+            } ?: "4.3.4"
         val processingGroup = project.findProperty("processing.group") as String? ?: "org.processing"
         val workingDir = project.findProperty("processing.workingDir") as String?
         val debugPort = project.findProperty("processing.debugPort") as String?