Merge pull request #993 from Stefterv/main

An assortment of Fixes

Author: Stefterv

Diff for: .github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Pre-releases
+name: Branch Builds (Legacy)
 on: 
   push:
     paths-ignore:

Diff for: .github/workflows/pull_request.yml

@@ -1,4 +1,4 @@
-name: Pull Requests
+name: Pull Requests (Legacy)
 on:
   pull_request:
     paths-ignore:

Diff for: .github/workflows/release-gradle.yml

@@ -134,7 +134,7 @@ jobs:
       - name: Install Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '17.0.8'
           distribution: 'temurin'
           architecture: ${{ matrix.arch }}
       - name: Setup Gradle
@@ -153,6 +153,22 @@ jobs:
           ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.password: ${{ secrets.PROCESSING_APP_PASSWORD }}
           ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.teamID: ${{ secrets.PROCESSING_TEAM_ID }}
           ORG_GRADLE_PROJECT_snapname: ${{ vars.SNAP_NAME }}
+      
+      - name: Sign files with Trusted Signing
+        if: runner.os == 'Windows'
+        uses: azure/trusted-signing-action@v0
+        with:
+          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+          endpoint: https://eus.codesigning.azure.net/
+          trusted-signing-account-name: ${{ secrets.AZURE_SIGNING_ACCOUNT_NAME }}
+          certificate-profile-name: ${{ secrets.AZURE_CERTIFICATE_PROFILE_NAME }}
+          files-folder: app/build/compose/binaries/main/msi
+          files-folder-filter: msi
+          file-digest: SHA256
+          timestamp-rfc3161: http://timestamp.acs.microsoft.com
+          timestamp-digest: SHA256
 
       - name: Upload portables to release
         uses: svenstaro/upload-release-action@v2
@@ -173,3 +189,5 @@ jobs:
         run: snapcraft upload --release=beta app/build/compose/binaries/main/${{ matrix.binary }}.${{ matrix.extension }}
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.PROCESSING_SNAPCRAFT_TOKEN }}
+
+      

Diff for: .github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Releases
+name: Releases (Legacy)
 on:
   release:
     types: [published]

Diff for: .gitignore

@@ -113,3 +113,5 @@ java/build/
 
 .build/
 /app/windows/obj
+/java/gradle/build
+/java/gradle/example/.processing

Diff for: app/build.gradle.kts

@@ -52,7 +52,7 @@ compose.desktop {
         jvmArgs(*listOf(
             Pair("processing.version", rootProject.version),
             Pair("processing.revision", findProperty("revision") ?: Int.MAX_VALUE),
-            Pair("processing.contributions.source", "https://download.processing.org/contribs.txt"),
+            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/"),
@@ -238,6 +238,7 @@ tasks.register("generateSnapConfiguration"){
           - x11
           - network
           - opengl
+          - home
     
     parts:
       processing:

Diff for: app/src/processing/app/platform/LinuxPlatform.java

@@ -33,8 +33,7 @@
 
 
 public class LinuxPlatform extends DefaultPlatform {
-  // Switched to use ~ as the home directory for compatibility with snap
-  String homeDir = "~";
+  String homeDir;
 
 
   public void initBase(Base base) {
@@ -107,6 +106,10 @@ public File getSettingsFolder() throws Exception {
         configHome = null;  // don't use non-existent folder
       }
     }
+    String snapUserCommon = System.getenv("SNAP_USER_COMMON");
+    if (snapUserCommon != null && !snapUserCommon.isBlank()) {
+      configHome = new File(snapUserCommon);
+    }
     // If not set properly, use the default
     if (configHome == null) {
       configHome = new File(getHomeDir(), ".config");