Merge branch 'main-gradle' into gradle/preprocessor

.github/workflows/build-gradle.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Add artifact
         uses: actions/upload-artifact@v4
         with:
-          name: processing-${{ github.ref_name }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-gradle
+          name: processing-${{ replace(github.ref_name, '/', '-') }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-gradle
           path:  |
             ./app/build/compose/binaries/main/dmg/Processing-*.dmg
             ./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt

.github/workflows/build.yml

@@ -72,6 +72,6 @@ jobs:
       - name: Add artifact
         uses: actions/upload-artifact@v4
         with:
-          name: processing-${{ github.ref_name }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-ant
+          name: processing-${{ replace(github.ref_name, '/', '-') }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-ant
           path:  ./build/${{ matrix.os_prefix }}/processing-${{github.sha}}-${{ matrix.os_prefix}}-*
           retention-days: 1

app/ant/processing/app/Schema.java

@@ -2,6 +2,9 @@ package processing.app;
 
 import processing.app.ui.Editor;
 
+// Stub class for backwards compatibility with the ant-build system
+// This class is not used in the Gradle build system
+// The actual implementation is in src/.../Schema.kt
 public class Schema {
     public static Editor handleSchema(String input, Base base) {
         return null;

app/ant/processing/app/contrib/ui/ContributionManagerKt.java

@@ -2,6 +2,9 @@ package processing.app.contrib.ui;
 
 import processing.app.contrib.ContributionManager;
 
+// Stub class for backwards compatibility with the ant-build system
+// This class is not used in the Gradle build system
+// The actual implementation is in src/.../ContributionManager.kt
 public final class ContributionManagerKt {
     public static void openContributionsManager() {
         ContributionManager.openLibraries();

app/build.gradle.kts

@@ -32,11 +32,9 @@ sourceSets{
     main{
         java{
             srcDirs("src")
-            exclude("**/*Kt.java")
         }
         kotlin{
             srcDirs("src")
-            exclude("**/*Kt.java")
         }
     }
 }
@@ -59,8 +57,6 @@ compose.desktop {
                 }
                 entitlementsFile.set(project.file("entitlements.plist"))
                 runtimeEntitlementsFile.set(project.file("entitlements.plist"))
-                // Allow swing to use the system look and feel
-                jvmArgs("-Dapple.awt.application.appearance=system")
             }
             windows{
                 iconFile = project.file("../build/windows/processing.ico")

app/src/processing/app/Platform.java

@@ -28,9 +28,6 @@ import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.PosixFilePermission;
 import java.util.*;
 
 import com.sun.jna.platform.FileUtils;

app/src/processing/app/UpdateCheck.java

@@ -56,7 +56,7 @@ import processing.core.PApplet;
 public class UpdateCheck {
   private final Base base;
 
-  static private final String DOWNLOAD_URL =  System.getProperty("processing.download.page","https://processing.org/download/");
+  static private final String DOWNLOAD_URL = System.getProperty("processing.download.page","https://processing.org/download/");
   static private final String LATEST_URL = System.getProperty("processing.download.latest","https://processing.org/download/latest.txt");
 
   static private final long ONE_DAY = 24 * 60 * 60 * 1000;

java/src/processing/mode/java/JavaBuild.java

@@ -770,7 +770,6 @@ public class JavaBuild {
         }
 
       }
-      // TODO: Handle the java embed and Icon with the new build system
 
     } else if (exportPlatform == PConstants.LINUX) {
       if (embedJava) {