From f994fac6b2812e5ad59a9c183b1fd8a773e0c094 Mon Sep 17 00:00:00 2001 From: kodjomoustapha <107993382+kodjodevf@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:39:04 +0100 Subject: [PATCH] + --- lib/src/rust/api/image.dart | 2 +- lib/src/rust/frb_generated.dart | 4 +- lib/src/rust/frb_generated.io.dart | 2 +- lib/src/rust/frb_generated.web.dart | 2 +- pubspec.lock | 106 ++++++++++++++-------------- pubspec.yaml | 25 +++++-- rust/Cargo.lock | 8 +-- rust/Cargo.toml | 2 +- rust/src/frb_generated.rs | 44 ++++++++++-- 9 files changed, 120 insertions(+), 75 deletions(-) diff --git a/lib/src/rust/api/image.dart b/lib/src/rust/api/image.dart index 034e0a4d..b09e5391 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.0.0. +// Generated by `flutter_rust_bridge`@ 2.1.0. // 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 01d4290b..f0a6be9b 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.0.0. +// Generated by `flutter_rust_bridge`@ 2.1.0. // 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 @@ -53,7 +53,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0'; + String get codegenVersion => '2.1.0'; @override int get rustContentHash => -287789500; diff --git a/lib/src/rust/frb_generated.io.dart b/lib/src/rust/frb_generated.io.dart index 800574ba..bb3a1e9d 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.0.0. +// Generated by `flutter_rust_bridge`@ 2.1.0. // 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 de2c19a5..f7cc5015 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.0.0. +// Generated by `flutter_rust_bridge`@ 2.1.0. // 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/pubspec.lock b/pubspec.lock index 582a950a..21a79813 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -229,10 +229,10 @@ packages: dependency: "direct main" description: name: cronet_http - sha256: "76336da9084672970bc830b88061b179467e9132c180a9c126352420697ad814" + sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" cross_file: dependency: transitive description: @@ -261,10 +261,10 @@ packages: dependency: "direct main" description: name: cupertino_http - sha256: d04385be00db206c75be8ec1229729398bb7e48723ce33fde3a81ff219e2d7ca + sha256: "7e75c45a27cc13a886ab0a1e4d8570078397057bd612de9d24fe5df0d9387717" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.5.1" cupertino_icons: dependency: "direct main" description: @@ -430,10 +430,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "2ca051989f69d1b2ca012b2cf3ccf78c70d40144f0861ff2c063493f7c8c3d45" + sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258" url: "https://pub.dev" source: hosted - version: "8.0.5" + version: "8.0.6" fixnum: dependency: transitive description: @@ -467,10 +467,10 @@ packages: dependency: "direct main" description: name: flutter_code_editor - sha256: "56673b62f2d844c1a2b0cf43a4495be0d6123111de5f33887781d2d3b39a77b6" + sha256: "505ad56dcc8a7be4b782c8113574571bc4b9723499b0c1f385b3e2c3fae11f5d" url: "https://pub.dev" source: hosted - version: "0.3.1" + version: "0.3.2" flutter_highlight: dependency: "direct main" description: @@ -537,10 +537,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: f703c4b50e253e53efc604d50281bbaefe82d615856f8ae1e7625518ae252e98 + sha256: fac14d2dd67eeba29a20e5d99fac0d4d9fcd552cdf6bf4f8945f7679c6b07b1d url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" flutter_test: dependency: "direct dev" description: flutter @@ -572,7 +572,7 @@ packages: description: path: "." ref: master - resolved-ref: "096d24d88454819b9f8a94af14a130cb372fa5ae" + resolved-ref: "9e7a954ffd54f38baa77520f47fc63ae80c22f14" url: "https://github.com/wgh136/flutter_windows_webview" source: git version: "0.0.1" @@ -588,10 +588,10 @@ packages: dependency: transitive description: name: freezed_annotation - sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.4" frontend_server_client: dependency: transitive description: @@ -612,10 +612,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: cdae1b9c8bd7efadcef6112e81c903662ef2ce105cbd220a04bbb7c3425b5554 + sha256: "39dd52168d6c59984454183148dc3a5776960c61083adfc708cc79a7b3ce1ba8" url: "https://pub.dev" source: hosted - version: "14.2.0" + version: "14.2.1" google_fonts: dependency: "direct main" description: @@ -636,10 +636,10 @@ packages: dependency: "direct main" description: name: grouped_list - sha256: fef106470186081c32636aa055492eee7fc7fe8bf0921a48d31ded24821af19f + sha256: c52551bc17699e304634d4653b824a1aa7c6b1d3a2c1a0da1a80839f867353fb url: "https://pub.dev" source: hosted - version: "5.1.2" + version: "6.0.0" highlight: dependency: "direct main" description: @@ -668,10 +668,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_client_helper: dependency: transitive description: @@ -684,10 +684,10 @@ packages: dependency: "direct main" description: name: http_interceptor - sha256: fc7eedc62433c17612bf65237a8aa2615553cc9130f1e4d75f7e5fa364d5232e + sha256: "288c6ded4a2c66de2730a16b30cbd29d05d042a5e61304d9b4be0e16378f4082" url: "https://pub.dev" source: hosted - version: "2.0.0-beta.8" + version: "2.0.0" http_multi_server: dependency: transitive description: @@ -780,10 +780,10 @@ packages: dependency: transitive description: name: jni - sha256: "6f8e04339f96cb32879acb181c60b2c1e2310ff86f3c62bcd1afcfb4b28b665d" + sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.10.1" js: dependency: transitive description: @@ -953,28 +953,30 @@ packages: source: hosted version: "1.0.4" media_kit_libs_windows_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_windows_video - sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122" - url: "https://pub.dev" - source: hosted + path: "libs/windows/media_kit_libs_windows_video" + ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" + resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" + url: "https://github.com/kodjodevf/media-kit.git" + source: git version: "1.0.9" media_kit_native_event_loop: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_native_event_loop - sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e - url: "https://pub.dev" - source: hosted + path: media_kit_native_event_loop + ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" + resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" + url: "https://github.com/kodjodevf/media-kit.git" + source: git version: "1.0.8" media_kit_video: dependency: "direct main" description: path: media_kit_video - ref: "0ab6b10ea660ead8e8e1694517aabe3582f25d5c" - resolved-ref: "0ab6b10ea660ead8e8e1694517aabe3582f25d5c" - url: "https://github.com/media-kit/media-kit.git" + ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" + resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" + url: "https://github.com/kodjodevf/media-kit.git" source: git version: "1.2.4" meta: @@ -1053,10 +1055,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a + sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e" url: "https://pub.dev" source: hosted - version: "2.2.6" + version: "2.2.7" path_provider_foundation: dependency: transitive description: @@ -1085,10 +1087,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" permission_handler: dependency: "direct main" description: @@ -1245,10 +1247,10 @@ packages: dependency: transitive description: name: riverpod_analyzer_utils - sha256: "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f" + sha256: ee72770090078e6841d51355292335f1bc254907c6694283389dcb8156d99a4d url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.5.3" riverpod_annotation: dependency: "direct main" description: @@ -1261,10 +1263,10 @@ packages: dependency: "direct dev" description: name: riverpod_generator - sha256: d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22 + sha256: "1ad626afbd8b01d168870b13c0b036f8a5bdb57c14cd426dc5b4595466bd6e2f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.2" rust_lib_mangayomi: dependency: "direct main" description: @@ -1553,10 +1555,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_linux: dependency: transitive description: @@ -1601,10 +1603,10 @@ packages: dependency: transitive description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.4.2" vector_math: dependency: transitive description: @@ -1665,18 +1667,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078" + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276 + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 570e9c20..ec442d8d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: flex_color_scheme: ^7.3.1 extended_image: ^8.2.1 photo_view: ^0.15.0 - grouped_list: ^5.1.2 + grouped_list: ^6.0.0 intl: ^0.19.0 google_fonts: ^6.2.1 url_launcher: ^6.3.0 @@ -47,11 +47,7 @@ dependencies: numberpicker: ^2.1.2 encrypt: ^5.0.3 media_kit: ^1.1.10+1 - media_kit_video: - git: - url: https://github.com/media-kit/media-kit.git - path: media_kit_video - ref: 0ab6b10ea660ead8e8e1694517aabe3582f25d5c + media_kit_video: ^1.2.4 media_kit_libs_video: ^1.0.4 crypto: ^3.0.3 cupertino_icons: ^1.0.6 @@ -76,7 +72,7 @@ dependencies: highlight: ^0.7.0 json_view: ^0.4.2 super_sliver_list: ^0.4.1 - flutter_rust_bridge: ^2.0.0 + flutter_rust_bridge: ^2.1.0 rust_lib_mangayomi: path: rust_builder pseudom: ^1.0.1 @@ -87,6 +83,21 @@ dependency_overrides: flex_seed_scheme: ^2.0.0 analyzer: ">=5.2.0 <7.0.0" html: ^0.15.4 + media_kit_native_event_loop: + git: + url: https://github.com/kodjodevf/media-kit.git + path: media_kit_native_event_loop + ref: 398abfa23f9da201cd0af7b23a950f6a14c06ae3 + media_kit_libs_windows_video: + git: + url: https://github.com/kodjodevf/media-kit.git + path: libs/windows/media_kit_libs_windows_video + ref: 398abfa23f9da201cd0af7b23a950f6a14c06ae3 + media_kit_video: + git: + url: https://github.com/kodjodevf/media-kit.git + path: media_kit_video + ref: 398abfa23f9da201cd0af7b23a950f6a14c06ae3 dev_dependencies: flutter_test: diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 18903d34..fa4e81a9 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -403,9 +403,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033e831e28f1077ceae3490fb6d093dfdefefd09c5c6e8544c6579effe7e814f" +checksum = "aebee2d1d5b8b3cfbbb11919b44791b4e0f037328195efd3832c7f7e0c6c6c8b" dependencies = [ "allo-isolate", "android_logger", @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0217fc4b7131b52578be60bbe38c76b3edfc2f9fecab46d9f930510f40ef9023" +checksum = "6c061770f5f09e99d6143612e95cfc1ba2ae773746fbe5826a9c914a533b0723" dependencies = [ "hex", "md-5", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 434a1476..87c40985 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = "=2.0.0" +flutter_rust_bridge = "=2.1.0" image = "0.25.0" diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index 0e049c63..8af28c84 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.0.0. +// Generated by `flutter_rust_bridge`@ 2.1.0. #![allow( non_camel_case_types, @@ -36,7 +36,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.0.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.1.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -287789500; // Section: executor @@ -182,14 +182,46 @@ impl SseEncode for bool { } #[cfg(not(target_family = "wasm"))] -#[path = "frb_generated.io.rs"] -mod io; +mod io { + // This file is automatically generated, so please do not edit it. + // Generated by `flutter_rust_bridge`@ 2.1.0. + + // Section: imports + + use super::*; + use flutter_rust_bridge::for_generated::byteorder::{ + NativeEndian, ReadBytesExt, WriteBytesExt, + }; + use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; + use flutter_rust_bridge::{Handler, IntoIntoDart}; + + // Section: boilerplate + + flutter_rust_bridge::frb_generated_boilerplate_io!(); +} #[cfg(not(target_family = "wasm"))] pub use io::*; /// cbindgen:ignore #[cfg(target_family = "wasm")] -#[path = "frb_generated.web.rs"] -mod web; +mod web { + // This file is automatically generated, so please do not edit it. + // Generated by `flutter_rust_bridge`@ 2.1.0. + + // Section: imports + + use super::*; + use flutter_rust_bridge::for_generated::byteorder::{ + NativeEndian, ReadBytesExt, WriteBytesExt, + }; + use flutter_rust_bridge::for_generated::wasm_bindgen; + use flutter_rust_bridge::for_generated::wasm_bindgen::prelude::*; + use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; + use flutter_rust_bridge::{Handler, IntoIntoDart}; + + // Section: boilerplate + + flutter_rust_bridge::frb_generated_boilerplate_web!(); +} #[cfg(target_family = "wasm")] pub use web::*;