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

PapaTutuWawa · Sep 29, 2024 · 7ceee48 · 7ceee48
1 parent 941c3e4
commit 7ceee48
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 69 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -15,20 +15,22 @@
       };
     };
     # Everything to make Flutter happy
-    sdk = android-nixpkgs.sdk.${system} (sdkPkgs: with sdkPkgs; [
-      cmdline-tools-latest
-      build-tools-30-0-3
-      build-tools-33-0-2
-      build-tools-34-0-0
-      platform-tools
-      emulator
-      patcher-v4
-      platforms-android-28
-      platforms-android-29
-      platforms-android-30
-      platforms-android-31
-      platforms-android-33
-    ]);
+    android = pkgs.androidenv.composeAndroidPackages {
+      # TODO: Find a way to pin these
+      #toolsVersion = "26.1.1";
+      #platformToolsVersion = "31.0.3";
+      #buildToolsVersions = [ "31.0.0" ];
+      #includeEmulator = true;
+      #emulatorVersion = "30.6.3";
+      platformVersions = [ "28" ];
+      includeSources = false;
+      includeSystemImages = true;
+      systemImageTypes = [ "default" ];
+      abiVersions = [ "x86_64" ];
+      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_HOME = "${sdk}/share/android-sdk";
+      ANDROID_SDK_ROOT = "${android.androidsdk}/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 = {

diff --git a/packages/moxxmpp/pubspec.yaml b/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
-  cryptography: ^2.0.5
+  collection: ^1.19.0
+  cryptography: ^2.7.0
   hex: ^0.2.0
-  json_serializable: ^6.3.1
-  logging: ^1.0.2
-  meta: ^1.7.0
+  json_serializable: ^6.8.0
+  logging: ^1.2.0
+  meta: ^1.16.0
   moxlib:
-   hosted: https://git.polynom.me/api/packages/Moxxy/pub
-   version: ^0.2.0
+    hosted: https://git.polynom.me/api/packages/Moxxy/pub
+    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
-  synchronized: ^3.0.0+2
-  uuid: ^3.0.5
-  xml: ^6.1.0
+  saslprep: ^1.0.3
+  synchronized: ^3.3.0+3
+  uuid: ^3.0.7
+  xml: ^6.5.0
 
 dev_dependencies:
-  build_runner: ^2.1.11
-  test: ^1.18.0
-  very_good_analysis: ^3.0.1
+  build_runner: ^2.4.12
+  test: ^1.25.8
+  very_good_analysis: ^6.0.0