flatpak: Improve Flatpak manifest

- Move manifest to `build-aux`
- Combine src file
- Convert main manifest to json

.github/workflows/build_flatpak.yml

@@ -8,12 +8,12 @@ jobs:
     name: "build-packages"
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
       options: --privileged
     steps:
     - uses: actions/checkout@v4
     - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: bottles.flatpak
-        manifest-path: com.usebottles.bottles.yml
+        manifest-path: build-aux/com.usebottles.bottles.json
         cache-key: flatpak-builder-${{ github.sha }}

.github/workflows/update-manifest.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   PR_BRANCH: pr/ci-manifest/${{ github.ref_name }}
-  FEDC_ARGS: --update --require-important-update --commit-only --never-fork "bottles-repository/com.usebottles.bottles.yml"
+  FEDC_ARGS: --update --require-important-update --commit-only --never-fork "bottles-repository/build-aux/com.usebottles.bottles.json"
   UPDATE_PYTHON: false
 
 jobs:
@@ -69,7 +69,7 @@ jobs:
         run: |
           git checkout -B ${{ env.PR_BRANCH }}
           git push -f --set-upstream origin ${{ env.PR_BRANCH }}
-          git diff ${{ github.ref_name }} --exit-code com.usebottles.bottles.yml
+          git diff ${{ github.ref_name }} --exit-code build-aux/com.usebottles.bottles.json
           updated=$?
           if [ $updated -ne 0 ] || [ "${{ env.UPDATE_PYTHON }}" = true ]; then
             gh pr create --title ":robot:: Update manifest (important)" --body ":wrench: One or more modules marked as 'important' have been updated." --head ${{ env.PR_BRANCH }} --base ${{ github.ref_name }}

CODING_GUIDE.md

@@ -5,7 +5,7 @@
 #### Build & install
 
 ```bash
-flatpak-builder --install --user --force-clean ./.flatpak-builder/out com.usebottles.bottles.yml
+flatpak-builder --install --user --force-clean ./.flatpak-builder/out ./build-aux/com.usebottles.bottles.json
 ```
 
 #### Run

README.md

@@ -54,7 +54,7 @@ There are two methods to build Bottles. The first and longer method is using `or
 
 1. Install [`org.flatpak.Builder`](https://github.com/flathub/org.flatpak.Builder) from Flathub
 1. Clone `https://github.com/bottlesdevs/Bottles.git` (or your fork)
-1. Run `flatpak run org.flatpak.Builder --install --install-deps-from=flathub --default-branch=master --force-clean build-dir com.usebottles.bottles.yml` in the terminal from the root of the repository (use `--user` if necessary)
+1. Run `flatpak run org.flatpak.Builder --install --install-deps-from=flathub --default-branch=master --force-clean build-dir build-aux/com.usebottles.bottles.json` in the terminal from the root of the repository (use `--user` if necessary)
 1. Run `flatpak run com.usebottles.bottles//master` to launch it
 
 ### Meson