From 17813cfec650b616e090b5c815dfc11bd388b3e6 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sat, 17 Aug 2024 00:05:48 +0200
Subject: [PATCH] Urgh, gradle snap really does not work?

---
 snap/snapcraft.yaml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 393126a3c..f8c077ae0 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -43,10 +43,6 @@ apps:
       - network
       - cups-control
       - opengl
-      - x11
-      - wayland
-      - desktop
-      - desktop-legacy
       - dot-java-user-prefs-openrocket
       - dot-openrocket
     environment:
@@ -56,18 +52,16 @@ parts:
   openrocket:
     plugin: gradle
     source: .
-    gradle-output-dir: 'build/libs'
-    gradle-options:
-      - shadowJar
     build-packages:
       - openjdk-17-jdk
     override-pull: |
-      snapcraftctl pull
+      craftctl default
       version=$(grep 'version =' build.gradle | awk '{print $3}' | tr -d "'")
-      snapcraftctl set-version "$version"
+      craftctl set version="$version"
     override-build: |
-      snapcraftctl build
-      mv build/libs/OpenRocket-*.jar $SNAPCRAFT_PART_INSTALL/OpenRocket.jar
+      craftctl default
+      mkdir -p $CRAFT_PART_INSTALL/bin
+      cp build/libs/OpenRocket-*.jar $CRAFT_PART_INSTALL/OpenRocket.jar
     stage-packages:
       - openjdk-17-jre
       - ca-certificates
@@ -80,5 +74,6 @@ parts:
   launcher:
     plugin: dump
     source: snap/local
+    source-type: local
     organize:
-      'launcher': 'bin/'
\ No newline at end of file
+      launcher: bin/launcher
\ No newline at end of file