From 420ccbb267c23937496af95318863b6ac6ccaac6 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Mon, 3 Feb 2025 12:07:01 +0100 Subject: [PATCH 1/3] - Imports cleanup - Disable system look & feel on macOS for readability - Cleaned unnecessary space - Cleaned finished TODO --- app/build.gradle.kts | 2 -- app/src/processing/app/Platform.java | 3 --- app/src/processing/app/UpdateCheck.java | 2 +- java/src/processing/mode/java/JavaBuild.java | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 773ce6514..411fe7a92 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -59,8 +59,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") diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java index 23a8df021..8d4d28ddc 100644 --- a/app/src/processing/app/Platform.java +++ b/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; diff --git a/app/src/processing/app/UpdateCheck.java b/app/src/processing/app/UpdateCheck.java index 1ec620a16..40ffe24c0 100644 --- a/app/src/processing/app/UpdateCheck.java +++ b/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; diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index 68a81eabb..aed0bc132 100644 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/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) { From 44ccb3daa4af919de4ffe0edda0fd7178d0a0bcc Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Tue, 4 Feb 2025 16:18:29 +0100 Subject: [PATCH 2/3] Removed outdated ant backwards compatibility marks --- app/ant/processing/app/Schema.java | 3 +++ app/ant/processing/app/contrib/ui/ContributionManagerKt.java | 3 +++ app/build.gradle.kts | 2 -- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/ant/processing/app/Schema.java b/app/ant/processing/app/Schema.java index 6e1e92ef2..3130c3dec 100644 --- a/app/ant/processing/app/Schema.java +++ b/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; diff --git a/app/ant/processing/app/contrib/ui/ContributionManagerKt.java b/app/ant/processing/app/contrib/ui/ContributionManagerKt.java index 7b0ee3098..f7497bfba 100644 --- a/app/ant/processing/app/contrib/ui/ContributionManagerKt.java +++ b/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(); diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 411fe7a92..6a0290694 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,11 +32,9 @@ sourceSets{ main{ java{ srcDirs("src") - exclude("**/*Kt.java") } kotlin{ srcDirs("src") - exclude("**/*Kt.java") } } } From 3b9aea1f40f1e7b903250cedaacc0e49f213ea9b Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Wed, 5 Feb 2025 12:55:55 +0100 Subject: [PATCH 3/3] Allow branches with `/` in the name --- .github/workflows/build-gradle.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-gradle.yml b/.github/workflows/build-gradle.yml index e53355d29..d7bab33ed 100644 --- a/.github/workflows/build-gradle.yml +++ b/.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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4182c98b0..e682709ea 100644 --- a/.github/workflows/build.yml +++ b/.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