Back to ubuntu core 18

RetGal · Jan 10, 2024 · 1bbdd9d · 1bbdd9d
1 parent f4c73c8
commit 1bbdd9d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 41 deletions.
diff --git a/snap/snapcraft.core18.yaml → snap/snapcraft.core22.yaml b/snap/snapcraft.core18.yaml → snap/snapcraft.core22.yaml
@@ -12,13 +12,18 @@ description: |
   - secure, end-to-end encrypted communication (TLS 1.3)
 license: GPL-3.0
 grade: stable
-base: core18
+base: core22
 confinement: strict
 
+lint:
+  ignore:
+    - library:
+        - usr/lib/jvm/java-*/lib/*.so
+
 apps:
   assisted:
     extensions:
-      [gnome-3-28]
+      [gnome]
     environment:
       JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-$SNAP_ARCH
       PATH: $JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
@@ -29,7 +34,7 @@ apps:
 
   assistant:
     extensions:
-      [gnome-3-28]
+      [gnome]
     environment:
       JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-$SNAP_ARCH
       PATH: $JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
@@ -40,7 +45,7 @@ apps:
 
   browser:
     extensions:
-      [gnome-3-28]
+      [gnome]
     command: bin/dayon.browser
     plugs:
       [home, network, desktop]
@@ -51,32 +56,19 @@ parts:
     source: https://github.com/retgal/dayon.git
     source-tag: master
     source-type: git
-    maven-options:
+    maven-parameters:
       [-Psnap]
 
     build-packages:
-      [default-jre]
+      - openjdk-11-jdk
+      - maven
 
     override-build: |
-      snapcraftctl build
-      cp target/dayon.browser $SNAPCRAFT_PART_INSTALL/bin/
-      cp target/dayon.launcher $SNAPCRAFT_PART_INSTALL/bin/
-      cp target/dayon.png $SNAPCRAFT_PART_INSTALL/bin/
-
-    override-pull: |
-      snapcraftctl pull
-      snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f1)"
-
-    filesets:
-      exclude-original-jar:
-        [-jar/original-dayon.jar]
-
-    stage:
-      [$exclude-original-jar]
+      craftctl default
+      cp target/dayon.browser $CRAFT_PART_INSTALL/bin/
+      cp target/dayon.launcher $CRAFT_PART_INSTALL/bin/
+      cp target/dayon.png $CRAFT_PART_INSTALL/bin/
+      rm $CRAFT_PART_INSTALL/jar/original-dayon.jar
 
     stage-packages:
-      [default-jre]
-
-    override-prime: |
-      snapcraftctl prime
-      rm -vf usr/lib/jvm/java-11-openjdk-*/lib/security/blacklisted.certs
+      [openjdk-11-jre]
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -12,14 +12,9 @@ description: |
   - secure, end-to-end encrypted communication (TLS 1.3)
 license: GPL-3.0
 grade: stable
-base: core22
+base: core18
 confinement: strict
 
-lint:
-  ignore:
-    - library:
-        - usr/lib/jvm/java-*/lib/*.so
-
 apps:
   assisted:
     extensions:
@@ -56,19 +51,32 @@ parts:
     source: https://github.com/retgal/dayon.git
     source-tag: master
     source-type: git
-    maven-parameters:
+    maven-options:
       [-Psnap]
 
     build-packages:
-      - openjdk-11-jdk
-      - maven
+      [default-jre]
 
     override-build: |
-      craftctl default
-      cp target/dayon.browser $CRAFT_PART_INSTALL/bin/
-      cp target/dayon.launcher $CRAFT_PART_INSTALL/bin/
-      cp target/dayon.png $CRAFT_PART_INSTALL/bin/
-      rm $CRAFT_PART_INSTALL/jar/original-dayon.jar
+      snapcraftctl build
+      cp target/dayon.browser $SNAPCRAFT_PART_INSTALL/bin/
+      cp target/dayon.launcher $SNAPCRAFT_PART_INSTALL/bin/
+      cp target/dayon.png $SNAPCRAFT_PART_INSTALL/bin/
+
+    override-pull: |
+      snapcraftctl pull
+      snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f1)"
+
+    filesets:
+      exclude-original-jar:
+        [-jar/original-dayon.jar]
+
+    stage:
+      [$exclude-original-jar]
 
     stage-packages:
-      [openjdk-11-jre]
+      [default-jre]
+
+    override-prime: |
+      snapcraftctl prime
+      rm -vf usr/lib/jvm/java-11-openjdk-*/lib/security/blacklisted.certs