Fixes differences from main

Author: Stefterv

app/build.gradle.kts

@@ -51,27 +51,65 @@ compose.desktop {
     application {
         mainClass = "processing.app.ProcessingKt"
 
-        jvmArgs(*listOf(
+        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())
+        ).map { "-D${it.first}=${it.second}" }.toTypedArray()
+        )
 
         nativeDistributions{
-            modules("jdk.jdi", "java.compiler", "jdk.accessibility", "jdk.zipfs", "java.management.rmi", "java.scripting", "jdk.httpserver")
+            modules(
+                "jdk.jdi",
+                "java.compiler",
+                "jdk.accessibility",
+                "jdk.zipfs",
+                "java.management.rmi",
+                "java.scripting",
+                "jdk.httpserver"
+            )
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "Processing"
 
 
 
 
-            fileAssociation("application/x-processing","pde", "Processing Source Code",rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pde.ico"), rootProject.file("build/macos/pde.icns"))
-            fileAssociation("application/x-processing","pyde", "Processing Python Source Code",rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pde.ico"), rootProject.file("build/macos/pde.icns"))
-            fileAssociation("application/x-processing","pdez", "Processing Sketch Bundle",rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pdze.ico"), rootProject.file("build/macos/pdez.icns"))
-            fileAssociation("application/x-processing","pdex", "Processing Contribution Bundle", rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pdex.ico"), rootProject.file("build/macos/pdex.icns"))
+            fileAssociation(
+                "application/x-processing",
+                "pde",
+                "Processing Source Code",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pde.ico"),
+                rootProject.file("build/macos/pde.icns")
+            )
+            fileAssociation(
+                "application/x-processing",
+                "pyde",
+                "Processing Python Source Code",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pde.ico"),
+                rootProject.file("build/macos/pde.icns")
+            )
+            fileAssociation(
+                "application/x-processing",
+                "pdez",
+                "Processing Sketch Bundle",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pdze.ico"),
+                rootProject.file("build/macos/pdez.icns")
+            )
+            fileAssociation(
+                "application/x-processing",
+                "pdex",
+                "Processing Contribution Bundle",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pdex.ico"),
+                rootProject.file("build/macos/pdex.icns")
+            )
 
             macOS{
                 bundleID = "${rootProject.group}.app"
@@ -267,7 +305,7 @@ tasks.register("generateSnapConfiguration"){
         )
     }
 }
-tasks.register("generateFlatpakConfiguration"){
+tasks.register("generateFlatpakConfiguration") {
     val identifier = findProperty("flathubidentifier") as String? ?: "org.processing.pde"
 
     val dir = distributable().destinationDir.get()
@@ -291,7 +329,7 @@ fun replaceVariablesInFile(
     target: RegularFile,
     variables: Map<String, String>,
     sections: List<String>
-){
+) {
     var content = source.asFile.readText()
     for ((key, value) in variables) {
         content = content.replace("\$$key", value)
@@ -320,7 +358,7 @@ tasks.register<Exec>("packageSnap"){
     commandLine("snapcraft")
 }
 
-tasks.register<Exec>("buildFlatpak"){
+tasks.register<Exec>("buildFlatpak") {
     onlyIf { OperatingSystem.current().isLinux }
     dependsOn("generateFlatpakConfiguration")
     group = "compose desktop"
@@ -340,7 +378,7 @@ tasks.register<Exec>("buildFlatpak"){
     )
 }
 
-tasks.register<Exec>("packageFlatpak"){
+tasks.register<Exec>("packageFlatpak") {
     onlyIf { OperatingSystem.current().isLinux }
     dependsOn("buildFlatpak")
     group = "compose desktop"
@@ -470,7 +508,7 @@ tasks.register<Copy>("includeJavaModeResources") {
 }
 // TODO: Move to java mode
 tasks.register<Copy>("renameWindres") {
-    dependsOn("includeSharedAssets","includeJavaModeResources")
+    dependsOn("includeSharedAssets", "includeJavaModeResources")
     val dir = composeResources("modes/java/application/launch4j/bin/")
     val os = DefaultNativePlatform.getCurrentOperatingSystem()
     val platform = when {
@@ -601,7 +639,14 @@ 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") })
+        dependsOn(
+            listOf(
+                "core",
+                "java:preprocessor",
+                "java:gradle",
+                "java:gradle:hotreload",
+                "app:utils"
+            ).map { project(":$it").tasks.named("publishAllPublicationsToAppRepository") })
     }
     tasks.named("createDistributable").configure {
         dependsOn("includeJdk")

app/src/processing/app/gradle/GradleJob.kt

@@ -17,14 +17,11 @@ import org.gradle.tooling.events.problems.internal.DefaultSingleProblemEvent
 import org.gradle.tooling.events.task.TaskFinishEvent
 import org.gradle.tooling.events.task.TaskStartEvent
 import org.gradle.tooling.events.task.TaskSuccessResult
-import processing.app.Base.DEBUG
-import processing.app.Base.getSketchbookFolder
-import processing.app.Base.getVersionName
+import processing.app.Base.*
 import processing.app.Language.text
 import processing.app.Messages
 import processing.app.Platform
 import processing.app.Platform.getContentFile
-import processing.app.Platform.getSettingsFolder
 import processing.app.Settings
 import processing.app.Sketch
 import processing.app.gradle.Log.Companion.startLogServer
@@ -33,7 +30,6 @@ import processing.app.ui.EditorStatus
 import java.nio.file.Path
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.writeText
-import kotlin.text.split
 
 /*
 * The gradle job runs the gradle tasks and manages the gradle connection

app/src/processing/app/gradle/GradleSettings.kt

@@ -1,43 +1,21 @@
 package processing.app.gradle
 
-import androidx.compose.foundation.VerticalScrollbar
-import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.scrollable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.rememberScrollbarAdapter
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.Checkbox
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposePanel
-import androidx.compose.ui.awt.SwingPanel
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
-import com.formdev.flatlaf.util.SwingUtils
-import com.github.ajalt.mordant.rendering.TextStyle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -47,12 +25,9 @@ import processing.app.Sketch
 import processing.app.ui.Editor
 import processing.app.ui.EditorFooter
 import processing.app.ui.Theme
-import processing.app.ui.theme.ProcessingTheme
+import processing.app.ui.theme.PDETheme
 import processing.app.watchFile
-import java.awt.Dimension
-import java.util.UUID
-import javax.swing.JCheckBox
-import javax.swing.JPanel
+import java.util.*
 import javax.swing.SwingUtilities
 
 class GradleSettings{
@@ -107,7 +82,7 @@ class GradleSettings{
             }
             val stateVertical = rememberScrollState(0)
 
-            ProcessingTheme {
+            PDETheme {
                 Box {
                     Row(
                         modifier = Modifier

app/src/processing/app/ui/Editor.java

@@ -27,6 +27,7 @@
 import processing.app.*;
 import processing.app.Formatter;
 import processing.app.contrib.ContributionManager;
+import processing.app.gradle.GradleService;
 import processing.app.laf.PdeMenuItemUI;
 import processing.app.syntax.*;
 import processing.core.PApplet;
@@ -213,10 +214,10 @@ public void windowDeactivated(WindowEvent e) {
       spacer.setAlignmentX(Component.LEFT_ALIGNMENT);
       box.add(spacer);
     }
-      if (Platform.isLinux()) {
-          setUndecorated(true);
-          getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
-      }
+    if (Platform.isLinux()) {
+      setUndecorated(true);
+      getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
+    }
 
     rebuildModePopup();
     toolbar = createToolbar();
@@ -373,7 +374,7 @@ public void actionPerformed(ActionEvent e) {
       });
     }
 
-      PreferencesEvents.onUpdated(this::updateTheme);
+    PreferencesEvents.onUpdated(this::updateTheme);
   }
 
 
@@ -1075,7 +1076,7 @@ public void buildDevelopMenu(){
     var updateTrigger = new JMenuItem(Language.text("menu.develop.check_for_updates"));
     updateTrigger.addActionListener(e -> {
         Preferences.unset("update.last");
-        Preferences.setInteger("update.beta_welcome", 0);
+      Preferences.setInteger("update.beta_welcome", 0);
         new UpdateCheck(base);
     });
     developMenu.add(updateTrigger);

build.gradle.kts

@@ -6,8 +6,6 @@ plugins {
 
     alias(libs.plugins.versions)
     alias(libs.plugins.mavenPublish) apply false
-
-    alias(libs.plugins.versions)
 }
 
 // Set the build directory to not /build to prevent accidental deletion through the clean action

java/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
-
 plugins {
     java
 }
@@ -68,7 +66,7 @@ tasks.register<Copy>("copyCore"){
     into(coreProject.layout.projectDirectory.dir("library"))
 }
 
-val legacyLibraries = arrayOf("io","net")
+val legacyLibraries = arrayOf("io", "net")
 legacyLibraries.forEach { library ->
     tasks.register<Copy>("library-$library-extraResources"){
         val build = project(":java:libraries:$library").tasks.named("build")
@@ -101,8 +99,11 @@ libraries.forEach { library ->
         from(project.layout.buildDirectory.dir("library"))
         into(javaMode("/libraries/$library"))
     }
-    tasks.named("extraResources"){ dependsOn("library-$library-extraResources") }
+    bundle.configure {
+        dependsOn(name)
+    }
 }
+
 tasks.jar { dependsOn("extraResources") }
 tasks.processResources{ finalizedBy("extraResources") }
 tasks.compileTestJava{ finalizedBy("extraResources") }

java/preprocessor/build.gradle.kts

@@ -49,8 +49,6 @@ publishing{
 mavenPublishing{
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
 
-    // Only sign if signing is set up
-    if(project.hasProperty("signing.keyId") || project.hasProperty("signingInMemoryKey"))
         signAllPublications()
 
     pom{

settings.gradle.kts

@@ -12,6 +12,7 @@ include(
     "java",
     "java:preprocessor",
     "java:gradle",
+    "java:gradle:hotreload",
     "java:libraries:dxf",
     "java:libraries:io",
     "java:libraries:net",