From d43f023f04975a02b1aa444b216fef449a82f6f3 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Fri, 16 Aug 2024 21:49:46 +0200
Subject: [PATCH] Revert back to core18, because gradle isn't supported
 elsewhere...

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ce1fd71e5..393126a3c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -15,7 +15,7 @@ description: |
     * Cross-platform (Java-based)
     * Read more about it on OpenRocket.info
 license: GPL-3.0
-base: core22
+base: core18
 confinement: strict
 
 plugs:
@@ -37,38 +37,39 @@ architectures:
 
 apps:
   openrocket:
-    extensions: [gnome]
     command: bin/launcher
     plugs:
       - home
       - network
       - cups-control
       - opengl
+      - x11
+      - wayland
+      - desktop
+      - desktop-legacy
       - dot-java-user-prefs-openrocket
       - dot-openrocket
     environment:
-      JAVA_HOME: "$SNAP/usr/lib/jvm/java-17-openjdk-$CRAFT_TARGET_ARCH"
+      JAVA_HOME: "$SNAP/usr/lib/jvm/java-17-openjdk-$SNAP_ARCH"
 
 parts:
   openrocket:
-    plugin: java
+    plugin: gradle
     source: .
-    java-version: "17"
-    java-build-system: gradle
     gradle-output-dir: 'build/libs'
     gradle-options:
       - shadowJar
     build-packages:
       - openjdk-17-jdk
     override-pull: |
-      craftctl default
+      snapcraftctl pull
       version=$(grep 'version =' build.gradle | awk '{print $3}' | tr -d "'")
-      craftctl set version="$version"
+      snapcraftctl set-version "$version"
     override-build: |
-      craftctl default
-      mv build/libs/OpenRocket-*.jar $CRAFT_PART_INSTALL/OpenRocket.jar
+      snapcraftctl build
+      mv build/libs/OpenRocket-*.jar $SNAPCRAFT_PART_INSTALL/OpenRocket.jar
     stage-packages:
-      - openjdk-17-jre-headless
+      - openjdk-17-jre
       - ca-certificates
       - ca-certificates-java
     prime: