Update package dependencies updated README.md to mention Nota WebPub …

…implementation. This commit updates several packages to their latest versions across different components, improving the overall functionality and compatibility. Additionally, WebPub support is now included in the readme feature list. In iOS Runner project, flutter_inappwebview has been replaced with flutter_inappwebview_ios for better iOS compatibility. Unnecessary debug log has also been removed from the assets_request_handler.
Mantano · Jan 21, 2024 · 574a0be · 574a0be
1 parent 0e21040
commit 574a0be
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 126 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ in binary form by [Edrlab](https://edrlab.org) that simply must be dropped into
 ## Features
 
 - [x] EPUB 2.x and 3.x support
+- [x] WebPub support (thanks to [Morten Sjøgren](https://github.com/m-abs), [Nota](https://github.com/Notalib)
 - [ ] Audiobook support
 - [ ] PDF support
 - [x] Readium LCP support (not in demo app yet)

diff --git a/components/commons/pubspec.yaml b/components/commons/pubspec.yaml
@@ -13,11 +13,11 @@ dependencies:
   dartx: ^1.2.0
   dfunc: ^0.9.0
   fimber: ^0.7.0
-  path: ^1.8.3
+  path: ^1.9.0
   universal_io: ^2.2.2
 
 dev_dependencies:
-  lints: ^2.1.1
-  test: ^1.24.6
+  lints: ^3.0.0
+  test: ^1.25.1
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/components/lcp/pubspec.yaml b/components/lcp/pubspec.yaml
@@ -23,8 +23,8 @@ dependencies:
   shared_preferences: ^2.2.2
   sqflite: ^2.3.0
   universal_io: ^2.2.2
-  url_launcher: ^6.2.1
-  uuid: ^4.2.1
+  url_launcher: ^6.2.3
+  uuid: ^4.3.3
   multiple_localization: ^0.4.0
   mno_commons:
     path: ../commons

diff --git a/components/navigator/pubspec.yaml b/components/navigator/pubspec.yaml
@@ -36,12 +36,12 @@ dependencies:
     path: ../webview
 
 dev_dependencies:
-  test: ^1.24.6
-  lints: ^2.1.1
+  test: ^1.25.1
+  lints: ^3.0.0
 
 dependency_overrides:
-  path: ^1.8.3
-  meta: ^1.9.1 # mno_shared 0.1.3 requires meta 1.9.1
+  path: ^1.9.0
+  meta: ^1.11.0 # mno_shared 0.1.3 requires meta 1.9.1
   collection: ^1.18.0 #universal_io
 
 flutter:

diff --git a/components/opds/pubspec.yaml b/components/opds/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   dartx: ^1.2.0
   dfunc: ^0.9.0
   fimber: ^0.7.0
-  http: ^1.1.2
+  http: ^1.2.0
   universal_io: ^2.2.2
   xml: ^6.5.0
   mno_commons:
@@ -21,4 +21,4 @@ dependencies:
 
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.24.9
+  test: ^1.25.1
diff --git a/components/server/example/pubspec.yaml b/components/server/example/pubspec.yaml
@@ -11,10 +11,10 @@ dependencies:
     path: ../
   mno_shared:
     path: ../../shared
-  universal_io: ^2.0.4
+  universal_io: ^2.2.2
 
 dev_dependencies:
-  lints: ^2.0.1
+  lints: ^3.0.0
 
 dependency_overrides:
-  collection: ^1.17.0
+  collection: ^1.18.0
diff --git a/components/server/lib/src/blocs/server/handlers/assets_request_handler.dart b/components/server/lib/src/blocs/server/handlers/assets_request_handler.dart
@@ -4,7 +4,6 @@
 
 import 'dart:typed_data';
 
-import 'package:fimber/fimber.dart';
 import 'package:mno_server/mno_server.dart';
 import 'package:mno_shared/mediatype.dart';
 import 'package:path/path.dart' as p;
@@ -50,8 +49,6 @@ class AssetsRequestHandler extends RequestHandler {
       );
       return true;
     } on Error catch (ex) {
-      // For debugging
-      Fimber.d("Error loading: $href", ex: ex, stacktrace: ex.stackTrace);
       return false;
     }
   }

diff --git a/components/server/pubspec.lock b/components/server/pubspec.lock
@@ -5,18 +5,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.7"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
+    version: "3.4.10"
   bloc:
     dependency: "direct main"
     description:
@@ -45,10 +37,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -69,10 +61,10 @@ packages:
     dependency: "direct main"
     description:
       name: dartx
-      sha256: "45d7176701f16c5a5e00a4798791c1964bc231491b879369c818dd9a9c764871"
+      sha256: "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   dfunc:
     dependency: "direct main"
     description:
@@ -93,10 +85,10 @@ packages:
     dependency: "direct main"
     description:
       name: fimber
-      sha256: "1415768ddd9fd66f134dbc53f731107554c98175a63d4e93234478a113ffabb8"
+      sha256: "42fcfa33acd43556c1e7ebfc12c2b03893418bc04a07931368c3573e228af2f0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.6"
+    version: "0.7.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -106,55 +98,79 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_inappwebview
-      sha256: fad1f2740ff4b5b7da378a639f54beeb9d787b6339c89a9de00494d92372c0bb
+      sha256: "3e9a443a18ecef966fb930c3a76ca5ab6a7aafc0c7b5e14a4a850cf107b09959"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0-beta.24+1"
+    version: "6.0.0"
+  flutter_inappwebview_android:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_android
+      sha256: fd4db51e46f49b140d83a3206851432c54ea920b381137c0ba82d0cf59be1dee
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.12"
   flutter_inappwebview_internal_annotations:
     dependency: transitive
     description:
       name: flutter_inappwebview_internal_annotations
-      sha256: "064a8ccbc76217dcd3b0fd6c6ea6f549e69b2849a0233b5bb46af9632c3ce2ff"
+      sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  flutter_web_plugins:
+    version: "1.1.1"
+  flutter_inappwebview_ios:
     dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  http:
+    description:
+      name: flutter_inappwebview_ios
+      sha256: f363577208b97b10b319cd0c428555cd8493e88b468019a8c5635a0e4312bd0f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.13"
+  flutter_inappwebview_macos:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_macos
+      sha256: b55b9e506c549ce88e26580351d2c71d54f4825901666bd6cfa4be9415bb2636
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.11"
+  flutter_inappwebview_platform_interface:
     dependency: transitive
     description:
-      name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      name: flutter_inappwebview_platform_interface
+      sha256: "545fd4c25a07d2775f7d5af05a979b2cac4fbf79393b0a7f5d33ba39ba4f6187"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
-  http_parser:
+    version: "1.0.10"
+  flutter_inappwebview_web:
     dependency: transitive
     description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      name: flutter_inappwebview_web
+      sha256: d8c680abfb6fec71609a700199635d38a744df0febd5544c5a020bd73de8ee07
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "1.0.8"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   image:
     dependency: transitive
     description:
       name: image
-      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
+      sha256: "004a2e90ce080f8627b5a04aecb4cdfac87d2c3f3b520aa291260be5a32c033d"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.17"
+    version: "4.1.4"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   js:
     dependency: transitive
     description:
@@ -167,26 +183,26 @@ packages:
     dependency: "direct dev"
     description:
       name: lints
-      sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015"
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.0"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.11.0"
   mno_commons:
     dependency: "direct main"
     description:
@@ -219,18 +235,26 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "2.1.8"
   pointycastle:
     dependency: transitive
     description:
@@ -252,30 +276,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
   time:
     dependency: transitive
     description:
@@ -296,10 +296,10 @@ packages:
     dependency: "direct main"
     description:
       name: universal_io
-      sha256: "302df7ff2b6a96960e9e447b42e1f238fa30525b92f7ddb47432f8406cd51401"
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   vector_math:
     dependency: transitive
     description:
@@ -308,14 +308,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.5.0"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.2.0 <4.0.0"
   flutter: ">=3.3.0"