Update flatpak bits

.gitlab-ci.yml

@@ -4,7 +4,7 @@ flatpak:
   image: fedora:latest
   stage: build
   variables:
-    MANIFEST_PATH: "build-aux/uk.me.bcowan.Rugby.json"
+    MANIFEST_PATH: "build-aux/uk.me.bcowan.Rugby.yml"
     RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
     FLATPAK_MODULE: "rugby"
     BUNDLE: "rugby.flatpak"
@@ -14,8 +14,8 @@ flatpak:
   script:
   - dnf install -y flatpak-builder
   - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  - flatpak install -y flathub org.gnome.Platform 3.34
-  - flatpak install -y flathub org.gnome.Sdk 3.34
+  - flatpak install -y flathub org.gnome.Platform 3.36
+  - flatpak install -y flathub org.gnome.Sdk 3.36
   - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
   - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
   - flatpak build app ninja -C _build install

build-aux/uk.me.bcowan.Rugby.json

-{
-    "app-id" : "uk.me.bcowan.Rugby",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.34",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "rugby",
-    "finish-args" : [
-        "--socket=x11",
-        "--socket=wayland"
-    ],
-    "modules" : [
-        {
-            "name" : "rugby",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://git.fossgalaxy.com/SuborbitalPigeon/rugby.git"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-        }
-    }
-}

build-aux/uk.me.bcowan.Rugby.json.license

-SPDX-FileCopyrightText: 2018 Bruce Cowan <bruce@bcowan.me.uk>
-SPDX-License-Identifier: CC0-1.0

build-aux/uk.me.bcowan.Rugby.yml

+# SPDX-FileCopyrightText: 2018-2020 Bruce Cowan <bruce@bcowan.me.uk>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+app-id: uk.me.bcowan.rugby
+runtime: org.gnome.Platform
+runtime-version: "3.36"
+sdk: org.gnome.Sdk
+command: rugby
+
+finish-args:
+  - "--socket=x11"
+  - "--socket=wayland"
+
+modules:
+  name: rugby
+  buildsystem: meson
+  builddir: true
+  sources:
+    - type: git
+      url: https://git.fossgalaxy.com/SuborbitalPigeon/rugby.git