fix(core): Bump omemo_dart (and everything else)

flake.lock

@@ -7,11 +7,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1694377165,
+        "lastModified": 1727554699,
-        "narHash": "sha256-NeIlZIElbkbKaNK5SZv6ULcFT/UGIICb3q7GPpkf9jk=",
+        "narHash": "sha256-puBCNL5PW7Pej+6Srmi2YjEgNeE015NFe33hbkkLqeQ=",
         "owner": "tadfisher",
         "repo": "android-nixpkgs",
-        "rev": "b020dc733ee69393841a50cf94d45735d5a5a57a",
+        "rev": "bc34ef1c71fe9eafcfb1d637b431fca83d746625",
         "type": "github"
       },
       "original": {
@@ -25,15 +25,14 @@
         "nixpkgs": [
           "android-nixpkgs",
           "nixpkgs"
-        ],
+        ]
-        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1693833206,
+        "lastModified": 1722113426,
-        "narHash": "sha256-wHOY0nnD6gWj8u9uI85/YlsganYyWRK1hLFZulZwfmY=",
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "65114ea495a8d3cc1352368bf170d67ef005aa5a",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
         "type": "github"
       },
       "original": {
@@ -43,6 +42,24 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems_2"
       },
@@ -60,31 +77,13 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694183432,
+        "lastModified": 1727348695,
-        "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
@@ -96,11 +95,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1694343207,
+        "lastModified": 1727586919,
-        "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=",
+        "narHash": "sha256-e/YXG0tO5GWHDS8QQauj8aj4HhXEm602q9swrrlTlKQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78058d810644f5ed276804ce7ea9e82d92bee293",
+        "rev": "2dcd9c55e8914017226f5948ac22c53872a13ee2",
         "type": "github"
       },
       "original": {
@@ -146,21 +145,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -15,20 +15,22 @@
       };
     };
     # Everything to make Flutter happy
-    sdk = android-nixpkgs.sdk.${system} (sdkPkgs: with sdkPkgs; [
+    android = pkgs.androidenv.composeAndroidPackages {
-      cmdline-tools-latest
+      # TODO: Find a way to pin these
-      build-tools-30-0-3
+      #toolsVersion = "26.1.1";
-      build-tools-33-0-2
+      #platformToolsVersion = "31.0.3";
-      build-tools-34-0-0
+      #buildToolsVersions = [ "31.0.0" ];
-      platform-tools
+      #includeEmulator = true;
-      emulator
+      #emulatorVersion = "30.6.3";
-      patcher-v4
+      platformVersions = [ "28" ];
-      platforms-android-28
+      includeSources = false;
-      platforms-android-29
+      includeSystemImages = true;
-      platforms-android-30
+      systemImageTypes = [ "default" ];
-      platforms-android-31
+      abiVersions = [ "x86_64" ];
-      platforms-android-33
+      includeNDK = false;
-    ]);
+      useGoogleAPIs = false;
+      useGoogleTVAddOns = false;
+    };
     lib = pkgs.lib;
     pinnedJDK = pkgs.jdk17;
 
@@ -68,9 +70,9 @@
       };
     in pkgs.mkShell {
       buildInputs = with pkgs; [
-        flutter pinnedJDK sdk dart # Dart
+        flutter pinnedJDK android.platform-tools dart # Dart
 	      gitlint # Code hygiene
-	      ripgrep # General utilities 
+	      ripgrep # General utilities
 
         # Flutter dependencies for Linux desktop
         atk
@@ -100,13 +102,13 @@
       CPATH = "${pkgs.xorg.libX11.dev}/include:${pkgs.xorg.xorgproto}/include";
       LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ atk cairo epoxy gdk-pixbuf glib gtk3 harfbuzz pango ];
 
-      ANDROID_SDK_ROOT = "${sdk}/share/android-sdk";
+      ANDROID_SDK_ROOT = "${android.androidsdk}/share/android-sdk";
-      ANDROID_HOME = "${sdk}/share/android-sdk";
+      ANDROID_HOME = "${android.androidsdk}/share/android-sdk";
       JAVA_HOME = pinnedJDK;
 
       # Fix an issue with Flutter using an older version of aapt2, which does not know
       # an used parameter.
-      GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${sdk}/share/android-sdk/build-tools/34.0.0/aapt2";
+      GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${android.androidsdk}/share/android-sdk/build-tools/34.0.0/aapt2";
     };
 
     apps = {

packages/moxxmpp/pubspec.yaml

@@ -5,28 +5,28 @@ homepage: https://codeberg.org/moxxy/moxxmpp
 publish_to: https://git.polynom.me/api/packages/Moxxy/pub
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  collection: ^1.16.0
+  collection: ^1.19.0
-  cryptography: ^2.0.5
+  cryptography: ^2.7.0
   hex: ^0.2.0
-  json_serializable: ^6.3.1
+  json_serializable: ^6.8.0
-  logging: ^1.0.2
+  logging: ^1.2.0
-  meta: ^1.7.0
+  meta: ^1.16.0
   moxlib:
-   hosted: https://git.polynom.me/api/packages/Moxxy/pub
+    hosted: https://git.polynom.me/api/packages/Moxxy/pub
-   version: ^0.2.0
+    version: ^0.2.0
   omemo_dart:
     hosted: https://git.polynom.me/api/packages/PapaTutuWawa/pub
-    version: ^0.5.1
+    version: ^0.6.0
   random_string: ^2.3.1
-  saslprep: ^1.0.2
+  saslprep: ^1.0.3
-  synchronized: ^3.0.0+2
+  synchronized: ^3.3.0+3
-  uuid: ^3.0.5
+  uuid: ^3.0.7
-  xml: ^6.1.0
+  xml: ^6.5.0
 
 dev_dependencies:
-  build_runner: ^2.1.11
+  build_runner: ^2.4.12
-  test: ^1.18.0
+  test: ^1.25.8
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^6.0.0