4 files changed, 9 insertions(+), 33 deletions(-)

R net.kirgroup.Oliver.json => flatpak/net.kirgroup.Oliver.json
D flatpak/phpstan
R run_local.sh => scripts/run_local.sh
M subprojects/blueprint-compiler.wrap

@@ 4,8 4,7 @@
     "runtime-version": "45",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
-        "org.freedesktop.Sdk.Extension.vala",
-        "org.freedesktop.Sdk.Extension.php83"
+        "org.freedesktop.Sdk.Extension.vala"
     ],
     "command" : "net.kirgroup.Oliver",
     "finish-args" : [


@@ 14,7 13,8 @@
         "--socket=fallback-x11",
         "--device=dri",
         "--socket=wayland",
-        "--filesystem=home"
+        "--filesystem=home",
+        "--filesystem=/usr/bin"
     ],
     "build-options" : {
         "append-path" : "/usr/lib/sdk/vala/bin",


@@ 44,28 44,8 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag" : "v0.10.0",
-                    "commit" : "2a39a16391122af2f3d812e478c1c1398c98b972"
-                }
-            ]
-        },
-        {
-            "name" : "phpstan",
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "install -D phpstan.phar /app/bin/phpstan.phar",
-                "install -D phpstan /app/bin/phpstan",
-                "sed -i 's|$PHP|/usr/lib/sdk/php83/bin|' /app/bin/phpstan"
-            ],
-            "sources" : [
-                {
-                    "type" : "file",
-                    "url" : "https://github.com/phpstan/phpstan/releases/download/1.10.57/phpstan.phar",
-                    "sha256" : "abea12048448c4ab4cf8b77d71fa36788f3495bb4d3cc201cfb5f2bbc7ff0dc6"
-                },
-                {
-                    "type" : "file",
-                    "path" : "flatpak/phpstan"
+                    "tag" : "v0.12.0",
+                    "commit" : "66b43c36cf1017c878762007373964a096b3d2a5"
                 }
             ]
         },


@@ 76,7 56,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "file:///home/fabio/progetti/oliver"
+                    "url" : "https://git.sr.ht/~fabrixxm/oliver"
                 }
             ]
         }

@@ 1,6 0,0 @@
-#!/usr/bin/env bash
-set -x
-
-export PATH=$PATH:$PHP
-/app/bin/phpstan.phar "$@"
-

@@ 1,6 1,8 @@
 #!/bin/bash
 set -e
 
+cd "$(dirname "$(dirname "$0")")"
+
 ninja -C builddir
 
 cp data/*.gschema.xml builddir/data

@@ 1,7 1,7 @@
 [wrap-git]
 directory = blueprint-compiler
 url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
-revision = main
+revision = v0.12.0
 depth = 1
 
 [provide]