Merge pull request #799 from marhkb/chore/2-0/update

Chore/2-0/update
marhkb · Sep 21, 2024 · be83822 · be83822
2 parents b25a333 + f3419a1
commit be83822
Show file tree

Hide file tree

Showing 86 changed files with 1,026 additions and 872 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,31 +1,31 @@
 [package]
 name = "pods"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["Marcus Behrendt <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-adw = { git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs", version = "0.6", package = "libadwaita", features = ["v1_4"] }
+adw = { version = "0.6", package = "libadwaita", features = ["v1_4"] }
 anyhow = "1"
-ashpd = { git = "https://github.com/bilelmoussaoui/ashpd.git", version = "0.6", rev = "30216eccd3f4ecb50c4d34a493a33e6eef4e375c", default-features = false, features = ["gtk4", "tokio"] }
+ashpd = { version = "0.8", default-features = false, features = ["gtk4", "tokio"] }
 futures = { version = "0.3", default-features = false }
-gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", version = "0.8", package = "gtk4", features = ["gnome_45"] }
+gettext-rs = { version = "=0.7.0", features = ["gettext-system"] }
+gtk = { version = "0.8", package = "gtk4", features = ["gnome_45"] }
 indexmap = { version = "2", features = ["serde"] }
 log = "0.4"
 names = { version = "0.14", default-features = false }
 oo7 = { version = "0.2", default-features = false, features = ["native_crypto", "tokio"] }
-panel = { git = "https://gitlab.gnome.org/World/Rust/libpanel-rs.git", version = "0.3", package = "libpanel", features = ["adw_v1_2"] }
+panel = { version = "0.4", package = "libpanel", features = ["adw_v1_2"] }
 paste = "1"
 podman-api = { git = "https://github.com/vv9k/podman-api-rs.git", commit = "363d945b9b9905c50dfa0bfe0f9331f9fdeef079", default-features = false }
 serde = "1"
 serde_json = "1"
-sourceview5 = { git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs.git", version = "0.8", features = ["gtk_v4_12"] }
-syslog = "6"
+sourceview5 = { version = "0.8", features = ["gtk_v4_12"] }
+syslog = "7"
 tokio = "1"
 tokio-tar = { version = "0.3", default-features = false }
 vte = { version = "0.13", default-features = false }
-vte4 = { git = "https://gitlab.gnome.org/World/Rust/vte4-rs.git", version = "0.8" }
+vte4 = "0.7"
 
 [profile.release]
 lto = true

diff --git a/build-aux/com.github.marhkb.Pods.Devel.json b/build-aux/com.github.marhkb.Pods.Devel.json
@@ -62,7 +62,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/libpanel.git",
-                    "tag": "1.4.0"
+                    "tag": "1.4.1"
                 }
             ]
         },

diff --git a/data/com.github.marhkb.Pods.metainfo.xml.in.in b/data/com.github.marhkb.Pods.metainfo.xml.in.in
@@ -42,6 +42,11 @@
   <url type="bugtracker">https://github.com/marhkb/pods/issues</url>
   <content_rating type="oars-1.1"/>
   <releases>
+    <release version="2.0.2" date="2024-09-20">
+      <description translatable="no">
+        <p>This release updates the project dependencies to stable versions.</p>
+      </description>
+    </release>
     <release version="2.0.1" date="2023-12-18">
       <description translatable="no">
         <p>The first point release of Pods contains the following fixes and style improvements:</p>
@@ -272,7 +277,7 @@
           <li>If a container is in a pod, it will now get a badge with the pod name in the container list.</li>
           <li>Logs, the result of the inspection of images, containers, and pods, and the result Kubernetes YAML generation can now be saved directly as a file.</li>
           <li>Headerbar titles were adjusted to be shorter and more concise</li>
-          <li>Many minor internal code improvements habe landed</li>
+          <li>Many minor internal code improvements have landed</li>
           <li>Dependencies and translations have been updated.</li>
         </ul>
       </description>

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'pods',
   'rust',
-  version: '2.0.1',
+  version: '2.0.2',
   meson_version: '>= 0.59',
   license: 'GPL3+',
 )

diff --git a/po/ar.po b/po/ar.po
@@ -762,7 +762,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/ca.po b/po/ca.po
@@ -741,7 +741,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/da.po b/po/da.po
@@ -753,7 +753,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/de.po b/po/de.po
@@ -758,7 +758,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/es.po b/po/es.po
@@ -757,7 +757,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/et.po b/po/et.po
@@ -740,7 +740,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/eu.po b/po/eu.po
@@ -758,7 +758,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/fa.po b/po/fa.po
@@ -739,7 +739,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/fi.po b/po/fi.po
@@ -759,7 +759,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/fr.po b/po/fr.po
@@ -761,7 +761,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/he.po b/po/he.po
@@ -740,7 +740,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/id.po b/po/id.po
@@ -765,7 +765,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/it.po b/po/it.po
@@ -757,7 +757,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/nb_NO.po b/po/nb_NO.po
@@ -764,7 +764,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/nl.po b/po/nl.po
@@ -763,7 +763,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/oc.po b/po/oc.po
@@ -739,7 +739,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/pl.po b/po/pl.po
@@ -757,7 +757,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/pods.pot b/po/pods.pot
@@ -741,7 +741,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/pt.po b/po/pt.po
@@ -763,7 +763,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -758,7 +758,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/ro.po b/po/ro.po
@@ -761,7 +761,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/ru.po b/po/ru.po
@@ -759,7 +759,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/si.po b/po/si.po
@@ -739,7 +739,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/sv.po b/po/sv.po
@@ -740,7 +740,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/ta.po b/po/ta.po
@@ -740,7 +740,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/tr.po b/po/tr.po
@@ -760,7 +760,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/uk.po b/po/uk.po
@@ -739,7 +739,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/po/zh_Hans.po b/po/zh_Hans.po
@@ -739,7 +739,7 @@ msgid "Headerbar titles were adjusted to be shorter and more concise"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:239
-msgid "Many minor internal code improvements habe landed"
+msgid "Many minor internal code improvements have landed"
 msgstr ""
 
 #: data/com.github.marhkb.Pods.metainfo.xml.in.in:246

diff --git a/src/application.rs b/src/application.rs
@@ -1,11 +1,11 @@
 use std::cell::Cell;
 use std::cell::OnceCell;
+use std::sync::OnceLock;
 
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
 use glib::clone;
-use glib::once_cell::sync::Lazy;
 use gtk::gdk;
 use gtk::gio;
 use gtk::glib;
@@ -33,10 +33,9 @@ mod imp {
 
     impl ObjectImpl for Application {
         fn properties() -> &'static [glib::ParamSpec] {
-            static PROPERTIES: Lazy<Vec<glib::ParamSpec>> =
-                Lazy::new(|| vec![glib::ParamSpecUInt64::builder("ticks").read_only().build()]);
-
-            PROPERTIES.as_ref()
+            static PROPERTIES: OnceLock<Vec<glib::ParamSpec>> = OnceLock::new();
+            PROPERTIES
+                .get_or_init(|| vec![glib::ParamSpecUInt64::builder("ticks").read_only().build()])
         }
 
         fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {

diff --git a/src/main.rs b/src/main.rs
@@ -17,17 +17,19 @@ use std::sync::OnceLock;
 use adw::prelude::*;
 use gettextrs::gettext;
 use gettextrs::LocaleCategory;
-use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
 
 use self::application::Application;
 
 pub(crate) static APPLICATION_OPTS: OnceLock<ApplicationOptions> = OnceLock::new();
-pub(crate) static RUNTIME: Lazy<tokio::runtime::Runtime> =
-    Lazy::new(|| tokio::runtime::Runtime::new().unwrap());
 pub(crate) static KEYRING: OnceLock<oo7::Keyring> = OnceLock::new();
 
+fn runtime() -> &'static tokio::runtime::Runtime {
+    static RUNTIME: OnceLock<tokio::runtime::Runtime> = OnceLock::new();
+    RUNTIME.get_or_init(|| tokio::runtime::Runtime::new().unwrap())
+}
+
 fn main() {
     let app = setup_cli(Application::default());
 
@@ -95,7 +97,7 @@ fn main() {
         }
     });
 
-    RUNTIME.block_on(async {
+    runtime().block_on(async {
         match oo7::Keyring::new().await {
             Ok(keyring) => KEYRING.set(keyring).unwrap(),
             Err(e) => log::error!("Failed to start Secret Service: {e}"),