eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-24 00:41:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main-gradle' into gradle/preprocessor

Browse Source
This commit is contained in:
Stef Tervelde
2025-02-05 12:56:38 +01:00
parent f016cc474c 3b9aea1f40
commit df745bb09c
8 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-gradle.yml vendored
View File

@@ -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

2
.github/workflows/build.yml vendored
View File

@@ -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

3
app/ant/processing/app/Schema.java
View File

@@ -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;

3
app/ant/processing/app/contrib/ui/ContributionManagerKt.java
View File

@@ -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();

4
app/build.gradle.kts
View File

@@ -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")

3
app/src/processing/app/Platform.java
View File

@@ -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;

2
app/src/processing/app/UpdateCheck.java
View File

@@ -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;

1
java/src/processing/mode/java/JavaBuild.java
View File

@@ -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) {