Upgrade to archive 4

LinwoodDev · Dec 12, 2024 · f804fe4 · f804fe4
1 parent 8dc1189
commit f804fe4
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 54 deletions.
diff --git a/api/lib/src/converter/xopp.dart b/api/lib/src/converter/xopp.dart
@@ -212,6 +212,6 @@ Uint8List xoppExporter(NoteData document) {
       });
     }
   });
-  return Uint8List.fromList(
-      GZipEncoder().encode(builder.buildDocument().toXmlString(pretty: true))!);
+  return Uint8List.fromList(GZipEncoder()
+      .encode(utf8.encode(builder.buildDocument().toXmlString(pretty: true))));
 }
diff --git a/api/pubspec.lock b/api/pubspec.lock
@@ -26,10 +26,10 @@ packages:
     dependency: "direct main"
     description:
       name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.1"
+    version: "4.0.1"
   args:
     dependency: transitive
     description:
@@ -190,6 +190,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.7"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
   file:
     dependency: transitive
     description:
@@ -314,8 +322,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/lw_file_system_api"
-      ref: "44984e1e51d4ba0ed631d2d201e92ea56e112393"
-      resolved-ref: "44984e1e51d4ba0ed631d2d201e92ea56e112393"
+      ref: b9d6c6173bf75247ce5a4d47fab0e48b730a9696
+      resolved-ref: b9d6c6173bf75247ce5a4d47fab0e48b730a9696
       url: "https://github.com/LinwoodDev/dart_pkgs"
     source: git
     version: "1.0.0"
@@ -391,6 +399,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
   pub_semver:
     dependency: transitive
     description:

diff --git a/api/pubspec.yaml b/api/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  archive: ^3.4.10
+  archive: ^4.0.0
   collection: ^1.18.0
   freezed_annotation: ^2.2.0
   json_annotation: ^4.9.0
@@ -19,7 +19,7 @@ dependencies:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs
       path: packages/lw_file_system_api
-      ref: 44984e1e51d4ba0ed631d2d201e92ea56e112393
+      ref: b9d6c6173bf75247ce5a4d47fab0e48b730a9696
 
 dev_dependencies:
   test: ^1.25.3

diff --git a/app/lib/dialogs/template.dart b/app/lib/dialogs/template.dart
@@ -108,7 +108,6 @@ class _TemplateDialogState extends State<TemplateDialog> {
             }
             final encoder = ZipEncoder();
             final bytes = encoder.encode(archive);
-            if (bytes == null) return;
             await exportZip(context, bytes);
           },
         ),

diff --git a/app/lib/settings/data.dart b/app/lib/settings/data.dart
@@ -132,9 +132,7 @@ class _DataSettingsPageState extends State<DataSettingsPage> {
                             final archive = exportDirectory(directory);
                             final encoder = ZipEncoder();
                             final bytes = encoder.encode(archive);
-                            if (bytes != null) {
-                              exportZip(context, bytes);
-                            }
+                            exportZip(context, bytes);
                           },
                         ),
                       ]),

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -34,10 +34,10 @@ packages:
     dependency: "direct main"
     description:
       name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.1"
+    version: "4.0.1"
   args:
     dependency: "direct main"
     description:
@@ -257,10 +257,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3"
+      sha256: e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.1.1"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -330,18 +330,18 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: f545ffbadee826f26f2e1a0f0cbd667ae9a6011cc0f77c0f8f00a969655e6e95
+      sha256: "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431"
       url: "https://pub.dev"
     source: hosted
-    version: "11.1.1"
+    version: "11.2.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.2"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -673,10 +673,10 @@ packages:
     dependency: "direct main"
     description:
       name: image
-      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
+      sha256: "599d08e369969bdf83138f5b4e0a7e823d3f992f23b8a64dd626877c37013533"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.0"
+    version: "4.4.0"
   integration_test:
     dependency: "direct main"
     description: flutter
@@ -782,17 +782,17 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/lw_file_system"
-      ref: fe6893a77b5a504a7d9632addba8510ea566563a
-      resolved-ref: fe6893a77b5a504a7d9632addba8510ea566563a
+      ref: f29b1ae0e338ec155e1c5b0a204c399232904540
+      resolved-ref: f29b1ae0e338ec155e1c5b0a204c399232904540
       url: "https://github.com/LinwoodDev/dart_pkgs"
     source: git
     version: "1.0.0"
   lw_file_system_api:
     dependency: transitive
     description:
       path: "packages/lw_file_system_api"
-      ref: "44984e1e51d4ba0ed631d2d201e92ea56e112393"
-      resolved-ref: "44984e1e51d4ba0ed631d2d201e92ea56e112393"
+      ref: b9d6c6173bf75247ce5a4d47fab0e48b730a9696
+      resolved-ref: b9d6c6173bf75247ce5a4d47fab0e48b730a9696
       url: "https://github.com/LinwoodDev/dart_pkgs"
     source: git
     version: "1.0.0"
@@ -916,18 +916,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
+      sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.1"
+    version: "8.1.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
+      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   path:
     dependency: transitive
     description:
@@ -995,18 +995,20 @@ packages:
   pdf:
     dependency: "direct main"
     description:
-      name: pdf
-      sha256: "05df53f8791587402493ac97b9869d3824eccbc77d97855f4545cf72df3cae07"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.11.1"
+      path: pdf
+      ref: "4be45bf7000640f38cb62088899a0f5185b4dc89"
+      resolved-ref: "4be45bf7000640f38cb62088899a0f5185b4dc89"
+      url: "https://github.com/CodeDoctorDE/dart_pdf.git"
+    source: git
+    version: "3.11.2"
   pdf_widget_wrapper:
     dependency: transitive
     description:
-      name: pdf_widget_wrapper
-      sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5
-      url: "https://pub.dev"
-    source: hosted
+      path: widget_wrapper
+      ref: c2b5d2b932ee1a4544db4ff8a9b218151b404c5c
+      resolved-ref: c2b5d2b932ee1a4544db4ff8a9b218151b404c5c
+      url: "https://github.com/CodeDoctorDE/dart_pdf.git"
+    source: git
     version: "1.0.4"
   perfect_freehand:
     dependency: "direct main"
@@ -1073,14 +1075,23 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
-  printing:
-    dependency: "direct main"
+  posix:
+    dependency: transitive
     description:
-      name: printing
-      sha256: b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.4"
+    version: "6.0.1"
+  printing:
+    dependency: "direct main"
+    description:
+      path: printing
+      ref: "4147fe72fcba3b271da02971171ff1ef71f3a7f7"
+      resolved-ref: "4147fe72fcba3b271da02971171ff1ef71f3a7f7"
+      url: "https://github.com/CodeDoctorDE/dart_pdf.git"
+    source: git
+    version: "5.14.0"
   process:
     dependency: transitive
     description:
@@ -1198,18 +1209,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8"
+      sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.2"
+    version: "10.1.3"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.2"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1403,10 +1414,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   type_plus:
     dependency: transitive
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -49,13 +49,21 @@ dependencies:
   window_manager: ^0.4.0
   flex_color_scheme: ^8.0.0
   json_annotation: ^4.9.0
-  printing: ^5.13.1
-  pdf: ^3.10.8
+  printing:
+    git:
+      url: https://github.com/CodeDoctorDE/dart_pdf.git
+      ref: 4147fe72fcba3b271da02971171ff1ef71f3a7f7
+      path: printing
+  pdf:
+    git:
+      url: https://github.com/CodeDoctorDE/dart_pdf.git
+      ref: 4be45bf7000640f38cb62088899a0f5185b4dc89
+      path: pdf
   http: ^1.2.1
   flutter_secure_storage: ^9.0.0
   equatable: ^2.0.5
   rxdart: ^0.28.0
-  archive: ^3.5.0
+  archive: ^4.0.0
   animations: ^2.0.11
   connectivity_plus: ^6.0.3
   cross_file: ^0.3.4+1
@@ -91,7 +99,7 @@ dependencies:
   lw_file_system:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs
-      ref: fe6893a77b5a504a7d9632addba8510ea566563a
+      ref: f29b1ae0e338ec155e1c5b0a204c399232904540
       path: packages/lw_file_system
   flutter_localized_locales: ^2.0.5
   dynamic_color: ^1.7.0