Merge branch 'gradle-runner' into gradle-runner-final

Author: Stefterv

.idea/jarRepositories.xml

@@ -0,0 +1,22 @@
+package processing.app.gradle;
+
+import processing.app.Mode;
+import processing.app.Sketch;
+import processing.app.ui.Editor;
+
+import java.io.PrintStream;
+
+public class GradleService {
+    public GradleService(Mode mode, Editor editor) { }
+
+    public void setEnabled(boolean enabled) {}
+    public boolean getEnabled() { return false; }
+    public void prepare(){}
+    public void run() {}
+    public void export(){}
+    public void stop() {}
+    public void startService() {}
+    public void setSketch(Sketch sketch) {}
+    public void setErr(PrintStream err) {}
+    public void setOut(PrintStream out) {}
+}

app/ant/processing/app/gradle/GradleService.java

@@ -1,6 +1,8 @@
 import org.gradle.internal.jvm.Jvm
+import org.gradle.kotlin.dsl.support.zipTo
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
 import org.jetbrains.compose.internal.de.undercouch.gradle.tasks.download.Download
@@ -49,14 +51,18 @@ compose.desktop {
     application {
         mainClass = "processing.app.ProcessingKt"
 
-        jvmArgs(*listOf(
-            Pair("processing.version", rootProject.version),
-            Pair("processing.revision", findProperty("revision") ?: Int.MAX_VALUE),
-            Pair("processing.contributions.source", "https://contributions.processing.org/contribs"),
-            Pair("processing.download.page", "https://processing.org/download/"),
-            Pair("processing.download.latest", "https://processing.org/download/latest.txt"),
-            Pair("processing.tutorials", "https://processing.org/tutorials/"),
-        ).map { "-D${it.first}=${it.second}" }.toTypedArray())
+
+        val variables = mapOf(
+            "processing.group" to (rootProject.group.takeIf { it != "" } ?: "processing"),
+            "processing.version" to rootProject.version,
+            "processing.revision" to (findProperty("revision") ?: Int.MAX_VALUE),
+            "processing.contributions.source" to "https://contributions.processing.org/contribs",
+            "processing.download.page" to "https://processing.org/download/",
+            "processing.download.latest" to "https://processing.org/download/latest.txt",
+            "processing.tutorials" to "https://processing.org/tutorials/"
+        )
+
+        jvmArgs(*variables.entries.map { "-D${it.key}=${it.value}" }.toTypedArray())
 
         nativeDistributions{
             modules("jdk.jdi", "java.compiler", "jdk.accessibility", "java.management.rmi", "java.scripting", "jdk.httpserver")
@@ -111,21 +117,22 @@ dependencies {
     implementation(compose.ui)
     implementation(compose.components.resources)
     implementation(compose.components.uiToolingPreview)
+    implementation(compose.materialIconsExtended)
 
     implementation(compose.desktop.currentOs)
 
     implementation(libs.compottie)
     implementation(libs.kaml)
     implementation(libs.markdown)
     implementation(libs.markdownJVM)
+    implementation(gradleApi())
+    implementation(libs.clikt)
+    implementation(libs.kotlinxSerializationJson)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.mockitoKotlin)
     testImplementation(libs.junitJupiter)
     testImplementation(libs.junitJupiterParams)
-
-    implementation(libs.clikt)
-    implementation(libs.kotlinxSerializationJson)
 }
 
 tasks.test {
@@ -390,32 +397,14 @@ tasks.register<Copy>("includeJavaModeResources") {
     from(java.layout.buildDirectory.dir("resources-bundled"))
     into(composeResources("../"))
 }
-// TODO: Move to java mode
-tasks.register<Copy>("renameWindres") {
-    dependsOn("includeSharedAssets","includeJavaModeResources")
-    val dir = composeResources("modes/java/application/launch4j/bin/")
-    val os = DefaultNativePlatform.getCurrentOperatingSystem()
-    val platform = when {
-        os.isWindows -> "windows"
-        os.isMacOsX -> "macos"
-        else -> "linux"
-    }
-    from(dir) {
-        include("*-$platform*")
-        rename("(.*)-$platform(.*)", "$1$2")
-    }
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    into(dir)
-}
 tasks.register("includeProcessingResources"){
     dependsOn(
         "includeCore",
         "includeJavaMode",
         "includeSharedAssets",
         "includeProcessingExamples",
         "includeProcessingWebsiteExamples",
-        "includeJavaModeResources",
-        "renameWindres"
+        "includeJavaModeResources"
     )
     mustRunAfter("includeJdk")
     finalizedBy("signResources")
@@ -495,9 +484,9 @@ tasks.register("signResources"){
         }
         file(composeResources("Info.plist")).delete()
     }
+}
 
 
-}
 tasks.register("setExecutablePermissions") {
     description = "Sets executable permissions on binaries in Processing.app resources"
     group = "compose desktop"
@@ -522,6 +511,8 @@ tasks.register("setExecutablePermissions") {
 afterEvaluate {
     tasks.named("prepareAppResources").configure {
         dependsOn("includeProcessingResources")
+        // Make sure all libraries are bundled in the maven repository distributed with the app
+        dependsOn(listOf("core","java:preprocessor", "java:gradle", "java:gradle:hotreload").map { project(":$it").tasks.named("publishAllPublicationsToAppRepository") })
     }
     tasks.named("createDistributable").configure {
         dependsOn("includeJdk")

app/build.gradle.kts

@@ -186,6 +186,9 @@ console.temp.days = 7
 console.scrollback.lines = 500
 console.scrollback.chars = 40000
 
+# run java sketches with Gradle aka the Modern Build System
+run.use_gradle = false
+
 # Any additional Java options when running.
 # If you change this and can't run things, it's your own durn fault.
 run.options =

app/src/main/resources/defaults.txt

@@ -183,7 +183,6 @@ static public Language init() {
     return instance;
   }
 
-
   static private String get(String key) {
     LanguageBundle bundle = init().bundle;
 

app/src/processing/app/Language.java

@@ -393,6 +393,8 @@ static public String getSketchbookPath() {
 
 
   static protected void setSketchbookPath(String path) {
+    // Unify path seperator for all platforms
+    path = path.replace(File.separatorChar, '/');
     set("sketchbook.path.four", path); //$NON-NLS-1$
   }
 }

app/src/processing/app/Preferences.java

@@ -34,6 +34,7 @@ fun loadPreferences(): Properties{
     }
 }
 
+// TODO: Move this to a more appropriate place
 @Composable
 fun watchFile(file: File): Any? {
     val scope = rememberCoroutineScope()

app/src/processing/app/Preferences.kt

@@ -10,6 +10,7 @@ import com.github.ajalt.clikt.parameters.arguments.multiple
 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.gradle.api.Sketch
 import processing.app.api.Contributions
 import processing.app.api.Sketchbook
 import processing.app.ui.Start
@@ -51,6 +52,7 @@ suspend fun main(args: Array<String>){
         .subcommands(
             LSP(),
             LegacyCLI(args),
+            Sketch(),
             Contributions(),
             Sketchbook()
         )

app/src/processing/app/Processing.kt

@@ -50,6 +50,8 @@
  * Stores information about files in the current sketch.
  */
 public class Sketch {
+  public static final String PROPERTIES_NAME = "sketch.properties";
+
   private final Editor editor;
   private final Mode mode;
 
@@ -1305,7 +1307,7 @@ static protected Settings loadProperties(File folder) throws IOException {
     }
     return null;
     */
-    return new Settings(new File(folder, "sketch.properties"));
+    return new Settings(new File(folder, PROPERTIES_NAME));
   }
 
 

app/src/processing/app/Sketch.java

@@ -0,0 +1,44 @@
+package processing.app.gradle
+
+import com.sun.jdi.Bootstrap
+import com.sun.jdi.VirtualMachine
+import com.sun.jdi.connect.AttachingConnector
+import kotlinx.coroutines.delay
+import processing.app.Messages
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeSource
+
+class Debugger {
+    companion object {
+        suspend fun connect(port: Int?): VirtualMachine? {
+            try {
+                Messages.log("Attaching to VM $port")
+                val connector = Bootstrap.virtualMachineManager().allConnectors()
+                    .firstOrNull { it.name() == "com.sun.jdi.SocketAttach" }
+                        as AttachingConnector?
+                    ?: throw IllegalStateException("No socket attach connector found")
+                val args = connector.defaultArguments()
+                args["port"]?.setValue(port?.toString() ?: "5005")
+
+                // Try to attach the debugger, retrying if it fails
+                // TODO: Stop retrying after the job has been cancelled / failed
+                val start = TimeSource.Monotonic.markNow()
+                while (start.elapsedNow() < 10.seconds) {
+                    try {
+                        val sketch = connector.attach(args)
+                        sketch.resume()
+                        Messages.log("Attached to VM: ${sketch.name()}")
+                        return sketch
+                    } catch (e: Exception) {
+                        Messages.log("Error while attaching to VM: ${e.message}... Retrying")
+                    }
+                    delay(250)
+                }
+            } catch (e: Exception) {
+                Messages.log("Error while attaching to VM: ${e.message}")
+                return null
+            }
+            return null
+        }
+    }
+}