Merge branch 'main' into addDependencyUpdates

Author: Stefterv

app/src/processing/app/Processing.kt

@@ -11,12 +11,27 @@ import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
 import processing.app.api.Contributions
+import processing.app.api.SketchCommand
 import processing.app.api.Sketchbook
 import processing.app.ui.Start
 import java.io.File
 import java.util.prefs.Preferences
 import kotlin.concurrent.thread
 
+
+
+suspend fun main(args: Array<String>){
+    Processing()
+        .subcommands(
+            LSP(),
+            LegacyCLI(args),
+            Contributions(),
+            Sketchbook(),
+            SketchCommand()
+        )
+        .main(args)
+}
+
 class Processing: SuspendingCliktCommand("processing"){
     val version by option("-v","--version")
         .flag()
@@ -46,16 +61,6 @@ class Processing: SuspendingCliktCommand("processing"){
     }
 }
 
-suspend fun main(args: Array<String>){
-   Processing()
-        .subcommands(
-            LSP(),
-            LegacyCLI(args),
-            Contributions(),
-            Sketchbook()
-        )
-        .main(args)
-}
 
 class LSP: SuspendingCliktCommand("lsp"){
     override fun help(context: Context) = "Start the Processing Language Server"
@@ -74,7 +79,6 @@ class LSP: SuspendingCliktCommand("lsp"){
     }
 }
 
-
 class LegacyCLI(val args: Array<String>): SuspendingCliktCommand("cli") {
     override val treatUnknownOptionsAsArgs = true
 

app/src/processing/app/api/SketchCommand.kt

@@ -0,0 +1,62 @@
+package processing.app.api
+
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.help
+import com.github.ajalt.clikt.parameters.options.option
+import processing.app.Language
+import processing.app.Platform
+import processing.app.Preferences
+import java.io.File
+
+class SketchCommand: SuspendingCliktCommand("sketch"){
+    override fun help(context: Context) = "Manage a Processing sketch"
+    override suspend fun run() {
+
+    }
+    init {
+        subcommands(Format())
+    }
+
+    class Format: SuspendingCliktCommand("format"){
+        override fun help(context: Context) = "Format a Processing sketch"
+        val file by argument("file")
+            .help("Path to the sketch file to format")
+        val inPlace by option("-i","--inplace")
+            .flag()
+            .help("Format the file in place, otherwise prints to stdout")
+
+        override suspend fun run(){
+            try {
+                Platform.init()
+                Language.init()
+                Preferences.init()
+
+                // run in headless mode
+                System.setProperty("java.awt.headless", "true")
+
+                val clazz = Class.forName("processing.mode.java.AutoFormat")
+                // Indirect invocation since app does not depend on java mode
+                val formatter = clazz
+                    .getDeclaredConstructor()
+                    .newInstance()
+
+                val method = clazz.getMethod("format", String::class.java)
+                val code = File(file).readText()
+
+                val formatted = method.invoke(formatter, code) as String
+                if(inPlace) {
+                    File(file).writeText(formatted)
+                    return
+                }
+                println(formatted)
+            } catch (e: Exception) {
+                throw InternalError("Failed to invoke main method", e)
+            }
+        }
+    }
+}

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 kotlin = "2.0.20"
 compose-plugin = "1.7.1"
 jogl = "2.5.0"
+antlr = "4.13.2"
 jupiter = "5.12.0"
 
 [libraries]
@@ -25,6 +26,11 @@ netbeansSwing = { module = "org.netbeans.api:org-netbeans-swing-outline", versio
 ant = { module = "org.apache.ant:ant", version = "1.10.14" }
 lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version = "0.22.0" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+antlr4 = { module = "org.antlr:antlr4", version.ref = "antlr" }
+antlr4Runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" }
+composeGradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-plugin" }
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlinComposePlugin = { module = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlin" }
 markdown = { module = "com.mikepenz:multiplatform-markdown-renderer-m2", version = "0.31.0" }
 markdownJVM = { module = "com.mikepenz:multiplatform-markdown-renderer-jvm", version = "0.31.0" }
 clikt = { module = "com.github.ajalt.clikt:clikt", version = "5.0.2" }
@@ -38,3 +44,4 @@ serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref
 download = { id = "de.undercouch.download", version = "5.6.0" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
 versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }
+gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }

java/build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-    id("java")
+    java
 }
 
 repositories{
     mavenCentral()
     google()
-    maven { url = uri("https://jogamp.org/deployment/maven") }
+    maven("https://jogamp.org/deployment/maven")
 }
 
 sourceSets{
@@ -48,13 +48,15 @@ tasks.compileJava{
 // LEGACY TASKS
 // Most of these are shims to be compatible with the old build system
 // They should be removed in the future, as we work towards making things more Gradle-native
-tasks.register<Copy>("extraResources"){
-    dependsOn(":java:copyCore")
+val javaMode = { path : String -> layout.buildDirectory.dir("resources-bundled/common/modes/java/$path") }
+
+val bundle = tasks.register<Copy>("extraResources"){
+    dependsOn("copyCore")
     from(".")
     include("keywords.txt")
     include("theme/**/*")
     include("application/**/*")
-    into( layout.buildDirectory.dir("resources-bundled/common/modes/java"))
+    into(javaMode(""))
 }
 tasks.register<Copy>("copyCore"){
     val coreProject = project(":core")
@@ -66,8 +68,8 @@ tasks.register<Copy>("copyCore"){
     into(coreProject.layout.projectDirectory.dir("library"))
 }
 
-val libraries = arrayOf("dxf","io","net","pdf","serial","svg")
-libraries.forEach { library ->
+val legacyLibraries = arrayOf("dxf","io","net","serial","svg")
+legacyLibraries.forEach { library ->
     tasks.register<Copy>("library-$library-extraResources"){
         val build = project(":java:libraries:$library").tasks.named("build")
         build.configure {
@@ -78,10 +80,30 @@ libraries.forEach { library ->
         include("*.properties")
         include("library/**/*")
         include("examples/**/*")
-        into( layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
+        into( javaMode("/libraries/$library"))
+    }
+    bundle.configure {
+        dependsOn("library-$library-extraResources")
+    }
+}
+
+val libraries = arrayOf("pdf")
+libraries.forEach { library ->
+    val name = "create-$library-library"
+    tasks.register<Copy>(name) {
+        group = "libraries"
+        val project = project(":java:libraries:$library")
+        val libraryTask = project.tasks.named("createLibrary")
+        dependsOn(libraryTask)
+
+        from(project.layout.buildDirectory.dir("library"))
+        into(javaMode("/libraries/$library"))
+    }
+    bundle.configure {
+        dependsOn(name)
     }
-    tasks.named("extraResources"){ dependsOn("library-$library-extraResources") }
 }
+
 tasks.jar { dependsOn("extraResources") }
 tasks.processResources{ finalizedBy("extraResources") }
 tasks.compileTestJava{ finalizedBy("extraResources") }

java/libraries/pdf/build.gradle.kts

@@ -1 +1,39 @@
-ant.importBuild("build.xml")
+plugins{
+    java
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs("src")
+        }
+    }
+}
+repositories{
+    mavenCentral()
+    maven("https://jogamp.org/deployment/maven/")
+}
+
+dependencies{
+    compileOnly(project(":core"))
+
+    implementation("com.lowagie:itext:2.1.7")
+}
+
+tasks.register<Copy>("createLibrary"){
+    dependsOn("jar")
+    into(layout.buildDirectory.dir("library"))
+
+    from(layout.projectDirectory){
+        include ("library.properties")
+        include("examples/**")
+    }
+
+    from(configurations.runtimeClasspath){
+        into("library")
+    }
+
+    from(tasks.jar) {
+        into("library")
+    }
+}