Snap fixes

[skip ci]

Author: Stefterv

.github/workflows/release-gradle.yml

@@ -169,18 +169,4 @@ jobs:
         if: runner.os == 'Linux'
         run: snapcraft upload app/build/compose/binaries/main/${{ matrix.binary }}.${{ matrix.extension }}
         env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.PROCESSING_SNAPCRAFT_TOKEN }}
-
-      - name: Upload pkg to App Store
-        if: runner.os == 'macOS'
-        run: | 
-          xcrun altool 
-            --upload-package app/build/compose/binaries/main/pkg/Processing-${{ needs.version.outputs.version }}.pkg 
-            --type macos 
-            --asc-public-id ${{ secrets.PROCESSING_STORE_PUBLIC_ID }} 
-            --apple-id ${{ secrets.PROCESSING_STORE_APP_ID }} 
-            --bundle-id ${{ vars.GRADLE_GROUP }}.app 
-            --bundle-short-version-string ${{ needs.version.outputs.version }} 
-            --bundle-version ${{ needs.version.outputs.version }} 
-            --username ${{ secrets.PROCESSING_APPLE_ID }} 
-            --password  ${{ secrets.PROCESSING_APP_PASSWORD }}
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.PROCESSING_SNAPCRAFT_TOKEN }}

app/build.gradle.kts

@@ -223,18 +223,21 @@ tasks.register("generateSnapConfiguration"){
         command: opt/processing/bin/Processing
         desktop: opt/processing/lib/processing-Processing.desktop
         environment:
-            LD_LIBRARY_PATH: ${'$'}SNAP/lib:${'$'}LD_LIBRARY_PATH
+            LD_LIBRARY_PATH: ${'$'}SNAPopt/processing/lib/runtime/lib:${'$'}LD_LIBRARY_PATH
         plugs:
           - desktop
           - desktop-legacy
           - wayland
           - x11
+          - network
     
     parts:
       processing:
         plugin: dump
         source: deb/processing_$version-1_$snaparch.deb
         source-type: deb
+        stage-packages:
+          - openjdk-17-jdk
         override-prime: |
           snapcraftctl prime
           chmod -R +x opt/processing/lib/app/resources/jdk-*

app/src/processing/app/Platform.java

@@ -578,17 +578,17 @@ static public boolean deleteFile(File file) throws IOException {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  static public void setenv(String variable, String value) {
-    inst.setenv(variable, value);
-  }
-
-
-  static public String getenv(String variable) {
-    return inst.getenv(variable);
-  }
-
-
-  static public int unsetenv(String variable) {
-    return inst.unsetenv(variable);
-  }
+//  static public void setenv(String variable, String value) {
+//    inst.setenv(variable, value);
+//  }
+//
+//
+//  static public String getenv(String variable) {
+//    return inst.getenv(variable);
+//  }
+//
+//
+//  static public int unsetenv(String variable) {
+//    return inst.unsetenv(variable);
+//  }
 }

app/src/processing/app/platform/DefaultPlatform.java

@@ -257,31 +257,31 @@ public void openFolder(File file) throws Exception {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public interface CLibrary extends Library {
-    CLibrary INSTANCE = Native.load("c", CLibrary.class);
-    int setenv(String name, String value, int overwrite);
-    String getenv(String name);
-    int unsetenv(String name);
-    int putenv(String string);
-  }
-
-
-  public void setenv(String variable, String value) {
-    CLibrary clib = CLibrary.INSTANCE;
-    clib.setenv(variable, value, 1);
-  }
-
-
-  public String getenv(String variable) {
-    CLibrary clib = CLibrary.INSTANCE;
-    return clib.getenv(variable);
-  }
-
-
-  public int unsetenv(String variable) {
-    CLibrary clib = CLibrary.INSTANCE;
-    return clib.unsetenv(variable);
-  }
+//  public interface CLibrary extends Library {
+//    CLibrary INSTANCE = Native.load("c", CLibrary.class);
+//    int setenv(String name, String value, int overwrite);
+//    String getenv(String name);
+//    int unsetenv(String name);
+//    int putenv(String string);
+//  }
+//
+//
+//  public void setenv(String variable, String value) {
+//    CLibrary clib = CLibrary.INSTANCE;
+//    clib.setenv(variable, value, 1);
+//  }
+//
+//
+//  public String getenv(String variable) {
+//    CLibrary clib = CLibrary.INSTANCE;
+//    return clib.getenv(variable);
+//  }
+//
+//
+//  public int unsetenv(String variable) {
+//    CLibrary clib = CLibrary.INSTANCE;
+//    return clib.unsetenv(variable);
+//  }
 
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

app/src/processing/app/platform/LinuxPlatform.java

@@ -33,7 +33,7 @@
 
 
 public class LinuxPlatform extends DefaultPlatform {
-  String homeDir;
+  String homeDir = "~";
 
 
   public void initBase(Base base) {
@@ -98,7 +98,7 @@ public File getSettingsFolder() throws Exception {
     File configHome = null;
 
     // Check to see if the user has set a different location for their config
-    String configHomeEnv = getenv("XDG_CONFIG_HOME");
+    String configHomeEnv = System.getenv("XDG_CONFIG_HOME");
     if (configHomeEnv != null && !configHomeEnv.isBlank()) {
       configHome = new File(configHomeEnv);
       if (!configHome.exists()) {