Merge branch 'master' of https://gitlab.gnome.org/World/Rust/gtk-rust…

…-template

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
     name: Flatpak
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-45
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
       options: --privileged
     steps:
     - uses: actions/checkout@v4

.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - test
 
 flatpak:
-  image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-45'
+  image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-46'
   stage: test
   tags:
     - flatpak

Cargo.toml

@@ -10,6 +10,6 @@ lto = true
 
 [dependencies]
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
+relm4 = { version = "0.8.1", features = ["libadwaita", "gnome_46"] }
 tracing = "0.1.37"
-tracing-subscriber = "0.3"
-relm4 = { version = "0.8.1", features = ["libadwaita", "gnome_45"] }
+tracing-subscriber = "0.3"

README.md

@@ -60,22 +60,23 @@ A new directory named `contrast` containing the generated project
 
 Make sure you have `flatpak` and `flatpak-builder` installed. Then run the commands below. Replace `<application_id>` with the value you entered during project creation. Please note that these commands are just for demonstration purposes. Normally this would be handled by your IDE, such as GNOME Builder or VS Code with the Flatpak extension.
 
-```
-flatpak install --user org.gnome.Sdk//45 org.freedesktop.Sdk.Extension.rust-stable//23.08 org.gnome.Platform//45 org.freedesktop.Sdk.Extension.llvm16//23.08
+```shell
+flatpak install --user org.gnome.Sdk//46 org.gnome.Platform//46  org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08
 flatpak-builder --user flatpak_app build-aux/<application_id>.Devel.json
 ```
 
 ## Running the project
 
 Once the project is build, run the command below. Replace Replace `<application_id>` and `<project_name>` with the values you entered during project creation. Please note that these commands are just for demonstration purposes. Normally this would be handled by your IDE, such as GNOME Builder or VS Code with the Flatpak extension.
 
-```
+```shell
 flatpak-builder --run flatpak_app build-aux/<application_id>.Devel.json <project_name>
 ```
 
 ## Community
 
 Join the GNOME and gtk-rs community!
+
 - [Matrix chat](https://matrix.to/#/#rust:gnome.org): chat with other developers using gtk-rs
 - [Discourse forum](https://discourse.gnome.org/tag/rust): topics tagged with `rust` on the GNOME forum.
 - [GNOME circle](https://circle.gnome.org/): take inspiration from applications and libraries already extending the GNOME ecosystem.

build-aux/com.belmoussaoui.GtkRustTemplate.Devel.json

@@ -1,7 +1,7 @@
 {
     "id": "com.belmoussaoui.GtkRustTemplate.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "45",
+    "runtime-version": "46",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",

data/meson.build

@@ -66,11 +66,9 @@ configure_file(
 )
 
 # Validata GSchema
-if glib_compile_schemas.found()
-  test(
-    'validate-gschema', glib_compile_schemas,
-    args: [
-      '--strict', '--dry-run', meson.current_build_dir()
-    ],
-  )
-endif
+test(
+  'validate-gschema', glib_compile_schemas,
+  args: [
+    '--strict', '--dry-run', meson.current_build_dir()
+  ],
+)

meson.build

@@ -15,11 +15,11 @@ dependency('glib-2.0', version: '>= 2.66')
 dependency('gio-2.0', version: '>= 2.66')
 dependency('gtk4', version: '>= 4.0.0')
 
-glib_compile_resources = find_program('glib-compile-resources', required: true)
-glib_compile_schemas = find_program('glib-compile-schemas', required: true)
+find_program('glib-compile-resources')
+glib_compile_schemas = find_program('glib-compile-schemas')
 desktop_file_validate = find_program('desktop-file-validate', required: false)
 appstreamcli = find_program('appstreamcli', required: false)
-cargo = find_program('cargo', required: true)
+cargo = find_program('cargo')
 
 version = meson.project_version()