diff --git a/lib/modules/library/providers/file_scanner.g.dart b/lib/modules/library/providers/file_scanner.g.dart index 5fdef31b..fcd9562f 100644 --- a/lib/modules/library/providers/file_scanner.g.dart +++ b/lib/modules/library/providers/file_scanner.g.dart @@ -6,7 +6,7 @@ part of 'file_scanner.dart'; // RiverpodGenerator // ************************************************************************** -String _$scanLocalLibraryHash() => r'80267fbc1da18bbd7ef6c8c4ef87bcea9ad99869'; +String _$scanLocalLibraryHash() => r'7fdedaa37917728d9f3b9d8f15090c94bdb34238'; /// Scans `Mangayomi/local` folder (if exists) for Mangas/Animes and imports in library. /// @@ -16,15 +16,14 @@ String _$scanLocalLibraryHash() => r'80267fbc1da18bbd7ef6c8c4ef87bcea9ad99869'; /// Mangayomi/local/MangaName/Chapter1/Page1.jpg /// Mangayomi/local/MangaName/Chapter2.cbz /// Mangayomi/local/AnimeName/Episode1.mp4 -/// Mangayomi/local/NovelName/Chapter1.epub -/// Mangayomi/local/NovelName/Chapter2.html +/// Mangayomi/local/NovelName/NovelName.epub /// ``` /// **Supported filetypes:** (taken from lib/modules/library/providers/local_archive.dart, line 98) /// ``` /// Videotypes: mp4, mov, avi, flv, wmv, mpeg, mkv /// Imagetypes: jpg, jpeg, png, webp /// Archivetypes: cbz, zip, cbt, tar -/// Other types: epub, html +/// Other types: epub /// ``` /// /// Copied from [scanLocalLibrary]. @@ -42,7 +41,7 @@ final scanLocalLibraryProvider = AutoDisposeFutureProvider.internal( @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef ScanLocalLibraryRef = AutoDisposeFutureProviderRef; -String _$localFoldersStateHash() => r'3bea18b0e5e6d9d1950e12293825fc85b1a0de6c'; +String _$localFoldersStateHash() => r'7cf7902ad34ee5ae018b2c9ac3849e822bc5f0b7'; /// See also [LocalFoldersState]. @ProviderFor(LocalFoldersState) diff --git a/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart b/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart index e23eca1d..d3096c04 100644 --- a/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart +++ b/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart @@ -6,7 +6,7 @@ part of 'update_manga_detail_providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$updateMangaDetailHash() => r'6e4faa1fe453df67182ff6698f1ca54a7fff2bea'; +String _$updateMangaDetailHash() => r'3b15af65efba4f27e0fe990c903e66973ac31af3'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/services/aniskip.g.dart b/lib/services/aniskip.g.dart index f7d0b025..95f27f5b 100644 --- a/lib/services/aniskip.g.dart +++ b/lib/services/aniskip.g.dart @@ -6,7 +6,7 @@ part of 'aniskip.dart'; // RiverpodGenerator // ************************************************************************** -String _$aniSkipHash() => r'2e5d19b025a2207ff64da7bf7908450ea9e5ff8c'; +String _$aniSkipHash() => r'887869b54e2e151633efd46da83bde845e14f421'; /// See also [AniSkip]. @ProviderFor(AniSkip) diff --git a/lib/services/get_latest_updates.g.dart b/lib/services/get_latest_updates.g.dart index c761d853..be0e07e2 100644 --- a/lib/services/get_latest_updates.g.dart +++ b/lib/services/get_latest_updates.g.dart @@ -6,7 +6,7 @@ part of 'get_latest_updates.dart'; // RiverpodGenerator // ************************************************************************** -String _$getLatestUpdatesHash() => r'b6a138d2e2202fc8fec29c1e4d31c4a4ddb8d848'; +String _$getLatestUpdatesHash() => r'7a3c06c469c77ec933cf2f4dd7d39780d993f0ea'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/services/get_popular.g.dart b/lib/services/get_popular.g.dart index 34f0f5d0..1fb73748 100644 --- a/lib/services/get_popular.g.dart +++ b/lib/services/get_popular.g.dart @@ -6,7 +6,7 @@ part of 'get_popular.dart'; // RiverpodGenerator // ************************************************************************** -String _$getPopularHash() => r'85152c70d6873dbf9c7f1b8a7f9d3846c53b9863'; +String _$getPopularHash() => r'f169b6a9ba76d9dd9237ba9c21805151a1419843'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/services/get_video_list.g.dart b/lib/services/get_video_list.g.dart index f1e92a40..ae5b1fb1 100644 --- a/lib/services/get_video_list.g.dart +++ b/lib/services/get_video_list.g.dart @@ -6,7 +6,7 @@ part of 'get_video_list.dart'; // RiverpodGenerator // ************************************************************************** -String _$getVideoListHash() => r'0b35633b9758cd633cc826801568aa81fbb27b61'; +String _$getVideoListHash() => r'c54f7294e15eeede933a6e04cd9b761d82b5f74c'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/services/search.g.dart b/lib/services/search.g.dart index ee8a4914..761e422f 100644 --- a/lib/services/search.g.dart +++ b/lib/services/search.g.dart @@ -6,7 +6,7 @@ part of 'search.dart'; // RiverpodGenerator // ************************************************************************** -String _$searchHash() => r'e23c6dd56549ffdfc89b5fcfa43719d90ca1760e'; +String _$searchHash() => r'b6bac0a3af58547bb93356f3c00a04135cd5a891'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/services/trackers/anilist.g.dart b/lib/services/trackers/anilist.g.dart index 1945ab1f..183e653f 100644 --- a/lib/services/trackers/anilist.g.dart +++ b/lib/services/trackers/anilist.g.dart @@ -6,7 +6,7 @@ part of 'anilist.dart'; // RiverpodGenerator // ************************************************************************** -String _$anilistHash() => r'89e86869bd2b807e08beb8b7af507809d8bb9895'; +String _$anilistHash() => r'b3c56b172308ecd98c4dd9fb89d17ccc36487754'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/src/rust/api/image.dart b/lib/src/rust/api/image.dart index adf945d5..2c05cd81 100644 --- a/lib/src/rust/api/image.dart +++ b/lib/src/rust/api/image.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/api/rhttp/client.dart b/lib/src/rust/api/rhttp/client.dart index 080aaa89..0dba1ee7 100644 --- a/lib/src/rust/api/rhttp/client.dart +++ b/lib/src/rust/api/rhttp/client.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/api/rhttp/error.dart b/lib/src/rust/api/rhttp/error.dart index 27bf91ac..4c9b71e6 100644 --- a/lib/src/rust/api/rhttp/error.dart +++ b/lib/src/rust/api/rhttp/error.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/api/rhttp/http.dart b/lib/src/rust/api/rhttp/http.dart index 7dbbeb1f..5fb3b8c8 100644 --- a/lib/src/rust/api/rhttp/http.dart +++ b/lib/src/rust/api/rhttp/http.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/frb_generated.dart b/lib/src/rust/frb_generated.dart index c48628a3..2c901304 100644 --- a/lib/src/rust/frb_generated.dart +++ b/lib/src/rust/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -27,11 +27,13 @@ class RustLib extends BaseEntrypoint { RustLibApi? api, BaseHandler? handler, ExternalLibrary? externalLibrary, + bool forceSameCodegenVersion = true, }) async { await instance.initImpl( api: api, handler: handler, externalLibrary: externalLibrary, + forceSameCodegenVersion: forceSameCodegenVersion, ); } @@ -63,7 +65,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.10.0'; + String get codegenVersion => '2.11.1'; @override int get rustContentHash => 885218533; diff --git a/lib/src/rust/frb_generated.io.dart b/lib/src/rust/frb_generated.io.dart index 79af6bb9..bdefb021 100644 --- a/lib/src/rust/frb_generated.io.dart +++ b/lib/src/rust/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/lib/src/rust/frb_generated.web.dart b/lib/src/rust/frb_generated.web.dart index 8428cc5c..4bdbb997 100644 --- a/lib/src/rust/frb_generated.web.dart +++ b/lib/src/rust/frb_generated.web.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/lib/src/rust/lib.dart b/lib/src/rust/lib.dart index 4594f124..ddec1497 100644 --- a/lib/src/rust/lib.dart +++ b/lib/src/rust/lib.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/pubspec.lock b/pubspec.lock index 3adb08f5..3c543454 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -349,10 +349,10 @@ packages: dependency: "direct main" description: name: d4rt - sha256: "802f4fed100431335d87912e97132117ad7dd2a455958c92b94995317d92402f" + sha256: "59521e738b85c2db8240775fec9dbeda488d58bf6c1c27198baba54bbe623c5a" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.1.5" dart_style: dependency: transitive description: @@ -549,10 +549,10 @@ packages: description: path: "." ref: main - resolved-ref: "67e99dd4547bdba15a49d53ab61f50397b194804" + resolved-ref: "5032c0ac4d257b0fad8d3c6cd05f6d15889fc1e5" url: "https://github.com/Schnitzel5/flutter-discord-rpc.git" source: git - version: "1.0.4" + version: "1.0.5" flutter_inappwebview: dependency: "direct main" description: @@ -667,10 +667,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb + sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.1" flutter_svg: dependency: transitive description: @@ -1012,10 +1012,10 @@ packages: dependency: "direct main" description: name: js_packer - sha256: f45ffa90165a810d7134f0b96b54068e4aac9d80a8b181eafa3978ec6dbc66a3 + sha256: "1d31c768594787acbab3573573e751fa6cf1e085ddacfd9cafd3d74eddb27060" url: "https://pub.dev" source: hosted - version: "0.0.5" + version: "0.0.6" json_annotation: dependency: transitive description: @@ -2230,5 +2230,5 @@ packages: source: hosted version: "2.2.2" sdks: - dart: ">=3.8.1 <4.0.0" + dart: ">=3.9.2 <4.0.0" flutter: ">=3.35.0" diff --git a/pubspec.yaml b/pubspec.yaml index 0b80dad9..614efcdf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 0.6.5+87 environment: - sdk: ^3.8.1 + sdk: ^3.9.2 dependencies: flutter: @@ -58,7 +58,7 @@ dependencies: ffi: ^2.1.3 ffigen: 19.1.0 http_interceptor: ^2.0.0 - js_packer: ^0.0.5 + js_packer: ^0.0.6 flutter_qjs: git: url: https://github.com/kodjodevf/flutter_qjs.git @@ -71,7 +71,7 @@ dependencies: re_highlight: ^0.0.3 json_view: ^0.4.2 super_sliver_list: ^0.4.1 - flutter_rust_bridge: 2.10.0 + flutter_rust_bridge: ^2.11.1 rust_lib_mangayomi: path: rust_builder pseudom: ^1.0.1 @@ -95,7 +95,7 @@ dependencies: git: url: https://github.com/kodjodevf/epubx.dart.git ref: dev - d4rt: 0.1.3 + d4rt: ^0.1.5 hive: ^2.2.3 hive_flutter: ^1.1.0 flutter_discord_rpc_fork: @@ -119,7 +119,7 @@ dev_dependencies: build_runner: ^2.4.6 riverpod_generator: ^2.6.5 flutter_launcher_icons: ^0.14.3 - isar_generator: + isar_generator: path: plugins/isar_generator flutter_lints: ^5.0.0 freezed: ^3.0.0 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 8b5c4543..4c179145 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -67,20 +67,19 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android_log-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" +checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d" [[package]] name = "android_logger" -version = "0.13.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" +checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3" dependencies = [ "android_log-sys", - "env_logger", + "env_filter", "log", - "once_cell", ] [[package]] @@ -416,12 +415,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "4.0.2" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -461,10 +463,10 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.1" +name = "env_filter" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ "log", "regex", @@ -522,9 +524,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1d2ad18166cead8c1b92b1c00e64aacc32e6ebd1ac95f77089c276c9c6bd8c" +checksum = "dde126295b2acc5f0a712e265e91b6fdc0ed38767496483e592ae7134db83725" dependencies = [ "allo-isolate", "android_logger", @@ -552,9 +554,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36cf75fba54902e67db5eef4a520df1c9f604db6f71f106fbc012477e2d81542" +checksum = "d5f0420326b13675321b194928bb7830043b68cf8b810e1c651285c747abb080" dependencies = [ "hex", "md-5", @@ -1217,9 +1219,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oslog" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8343ce955f18e7e68c0207dd0ea776ec453035685395ababd2ea651c569728b3" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" dependencies = [ "cc", "dashmap", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index f0173b09..4191b15b 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = { version = "=2.10.0", features = ["chrono"] } +flutter_rust_bridge = { version = "=2.11.1", features = ["chrono"] } image = "0.25.6" chrono = "0.4.41" futures-util = "0.3.31" diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index dddbac6d..0dc3319c 100644 --- a/rust/src/frb_generated.rs +++ b/rust/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. #![allow( non_camel_case_types, @@ -38,7 +38,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.10.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.11.1"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 885218533; // Section: executor @@ -2441,7 +2441,7 @@ impl SseEncode for usize { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.10.0. + // @generated by `flutter_rust_bridge`@ 2.11.1. // Section: imports @@ -2507,7 +2507,7 @@ pub use io::*; #[cfg(target_family = "wasm")] mod web { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.10.0. + // @generated by `flutter_rust_bridge`@ 2.11.1. // Section: imports