From 2a8c04f9c3c2e0bd33b3a50bd5e4796e95662d86 Mon Sep 17 00:00:00 2001 From: kodjomoustapha <107993382+kodjodevf@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:28:24 +0100 Subject: [PATCH] + --- .github/workflows/release.yml | 2 +- lib/src/rust/api/image.dart | 2 +- lib/src/rust/api/rhttp/client.dart | 2 +- lib/src/rust/api/rhttp/error.dart | 2 +- lib/src/rust/api/rhttp/http.dart | 2 +- lib/src/rust/frb_generated.dart | 51 +++++++++++++++++++---------- lib/src/rust/frb_generated.io.dart | 11 ++++++- lib/src/rust/frb_generated.web.dart | 11 ++++++- lib/src/rust/lib.dart | 2 +- pubspec.lock | 20 +++++------ pubspec.yaml | 5 ++- rust/Cargo.lock | 8 ++--- rust/Cargo.toml | 4 +-- rust/src/frb_generated.rs | 25 +++++++++++--- 14 files changed, 99 insertions(+), 48 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa26210..1acca92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -342,7 +342,7 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Install the CLI tool - run: cargo install 'flutter_rust_bridge_codegen@^2.0.0-dev.0' + run: cargo install 'flutter_rust_bridge_codegen' - name: flutter pub get diff --git a/lib/src/rust/api/image.dart b/lib/src/rust/api/image.dart index eea4467..93a702d 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // 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 9d3e94c..bf96240 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // 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 b5e7184..aeb40c9 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // 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 0ed5faf..c51eca5 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.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 c35bf91..eb5aed1 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.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 @@ -67,7 +67,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.3.0'; + String get codegenVersion => '2.4.0'; @override int get rustContentHash => 107666026; @@ -745,7 +745,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { dco_decode_list_prim_u_8_strict(raw[1]), ); case 2: - return HttpResponseBody_Stream(); + return const HttpResponseBody_Stream(); default: throw Exception("unreachable"); } @@ -769,6 +769,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return dcoDecodeI64(raw); } + @protected + PlatformInt64 dco_decode_isize(dynamic raw) { + // Codec=Dco (DartCObject based), see doc to use other codecs + return dcoDecodeI64(raw); + } + @protected List dco_decode_list_list_prim_u_8_strict(dynamic raw) { // Codec=Dco (DartCObject based), see doc to use other codecs @@ -890,7 +896,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { // Codec=Dco (DartCObject based), see doc to use other codecs switch (raw[0]) { case 0: - return RedirectSettings_NoRedirect(); + return const RedirectSettings_NoRedirect(); case 1: return RedirectSettings_LimitedRedirects( dco_decode_i_32(raw[1]), @@ -905,11 +911,11 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { // Codec=Dco (DartCObject based), see doc to use other codecs switch (raw[0]) { case 0: - return RhttpError_RhttpCancelError(); + return const RhttpError_RhttpCancelError(); case 1: - return RhttpError_RhttpTimeoutError(); + return const RhttpError_RhttpTimeoutError(); case 2: - return RhttpError_RhttpRedirectError(); + return const RhttpError_RhttpRedirectError(); case 3: return RhttpError_RhttpStatusCodeError( dco_decode_u_16(raw[1]), @@ -1043,7 +1049,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @protected Object sse_decode_DartOpaque(SseDeserializer deserializer) { // Codec=Sse (Serialization based), see doc to use other codecs - var inner = sse_decode_usize(deserializer); + var inner = sse_decode_isize(deserializer); return decodeDartOpaque(inner, generalizedFrbRustBinding); } @@ -1237,7 +1243,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { var var_field0 = sse_decode_list_prim_u_8_strict(deserializer); return HttpResponseBody_Bytes(var_field0); case 2: - return HttpResponseBody_Stream(); + return const HttpResponseBody_Stream(); default: throw UnimplementedError(''); } @@ -1262,6 +1268,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return deserializer.buffer.getPlatformInt64(); } + @protected + PlatformInt64 sse_decode_isize(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + return deserializer.buffer.getPlatformInt64(); + } + @protected List sse_decode_list_list_prim_u_8_strict( SseDeserializer deserializer) { @@ -1458,7 +1470,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { var tag_ = sse_decode_i_32(deserializer); switch (tag_) { case 0: - return RedirectSettings_NoRedirect(); + return const RedirectSettings_NoRedirect(); case 1: var var_field0 = sse_decode_i_32(deserializer); return RedirectSettings_LimitedRedirects(var_field0); @@ -1474,11 +1486,11 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { var tag_ = sse_decode_i_32(deserializer); switch (tag_) { case 0: - return RhttpError_RhttpCancelError(); + return const RhttpError_RhttpCancelError(); case 1: - return RhttpError_RhttpTimeoutError(); + return const RhttpError_RhttpTimeoutError(); case 2: - return RhttpError_RhttpRedirectError(); + return const RhttpError_RhttpRedirectError(); case 3: var var_field0 = sse_decode_u_16(deserializer); var var_field1 = sse_decode_list_record_string_string(deserializer); @@ -1647,10 +1659,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @protected void sse_encode_DartOpaque(Object self, SseSerializer serializer) { // Codec=Sse (Serialization based), see doc to use other codecs - sse_encode_usize( - BigInt.from(PlatformPointerUtil.ptrToInt(encodeDartOpaque( - self, portManager.dartHandlerPort, generalizedFrbRustBinding))) - .toUnsigned(64), + sse_encode_isize( + PlatformPointerUtil.ptrToPlatformInt64(encodeDartOpaque( + self, portManager.dartHandlerPort, generalizedFrbRustBinding)), serializer); } @@ -1857,6 +1868,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { serializer.buffer.putPlatformInt64(self); } + @protected + void sse_encode_isize(PlatformInt64 self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + serializer.buffer.putPlatformInt64(self); + } + @protected void sse_encode_list_list_prim_u_8_strict( List self, SseSerializer serializer) { diff --git a/lib/src/rust/frb_generated.io.dart b/lib/src/rust/frb_generated.io.dart index c02bd16..bd08a03 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.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 @@ -156,6 +156,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected PlatformInt64 dco_decode_i_64(dynamic raw); + @protected + PlatformInt64 dco_decode_isize(dynamic raw); + @protected List dco_decode_list_list_prim_u_8_strict(dynamic raw); @@ -350,6 +353,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected PlatformInt64 sse_decode_i_64(SseDeserializer deserializer); + @protected + PlatformInt64 sse_decode_isize(SseDeserializer deserializer); + @protected List sse_decode_list_list_prim_u_8_strict( SseDeserializer deserializer); @@ -578,6 +584,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer); + @protected + void sse_encode_isize(PlatformInt64 self, SseSerializer serializer); + @protected void sse_encode_list_list_prim_u_8_strict( List self, SseSerializer serializer); diff --git a/lib/src/rust/frb_generated.web.dart b/lib/src/rust/frb_generated.web.dart index e115ca2..767af83 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.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 @@ -158,6 +158,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected PlatformInt64 dco_decode_i_64(dynamic raw); + @protected + PlatformInt64 dco_decode_isize(dynamic raw); + @protected List dco_decode_list_list_prim_u_8_strict(dynamic raw); @@ -352,6 +355,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected PlatformInt64 sse_decode_i_64(SseDeserializer deserializer); + @protected + PlatformInt64 sse_decode_isize(SseDeserializer deserializer); + @protected List sse_decode_list_list_prim_u_8_strict( SseDeserializer deserializer); @@ -580,6 +586,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer); + @protected + void sse_encode_isize(PlatformInt64 self, SseSerializer serializer); + @protected void sse_encode_list_list_prim_u_8_strict( List self, SseSerializer serializer); diff --git a/lib/src/rust/lib.dart b/lib/src/rust/lib.dart index ecb1f00..c89e1a2 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/pubspec.lock b/pubspec.lock index 040adf8..e199c2a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -58,10 +58,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda" + sha256: "2ca377ad4d677bbadca278e0ba4da4e057b80a10b927bfc8f7d8bda8fe2ceb75" url: "https://pub.dev" source: hosted - version: "1.5.3" + version: "1.5.4" async: dependency: transitive description: @@ -371,10 +371,10 @@ packages: dependency: "direct main" description: name: extended_image - sha256: "1733803146df102c66e71af8099afd0e5dafc96ff6aa4802825e82108e8fb897" + sha256: c7b628bdbeb398bdd824cfc9d521f18e04b63ad2af811d182e885d3ae4ef45de url: "https://pub.dev" source: hosted - version: "8.2.2" + version: "8.2.3" extended_image_library: dependency: transitive description: @@ -526,10 +526,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: b0271cc147d5afccf9774809e4eef52b7357babe1a1a31db649df6f02dd27580 + sha256: a43a6649385b853bc836ef2bc1b056c264d476c35e131d2d69c38219b5e799f1 url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" flutter_test: dependency: "direct dev" description: flutter @@ -1456,10 +1456,10 @@ packages: dependency: transitive description: name: synchronized - sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255 + sha256: "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.0+2" term_glyph: dependency: transitive description: @@ -1749,5 +1749,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=3.5.1 <4.0.0" - flutter: ">=3.24.1" + dart: ">=3.5.3 <4.0.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6e03ef9..1919cd5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,8 +4,7 @@ publish_to: "none" version: 0.3.0+66 environment: - sdk: ">=3.5.1 <4.0.0" - flutter: 3.24.1 + sdk: ">=3.5.3 <4.0.0" dependencies: flutter: @@ -71,7 +70,7 @@ dependencies: highlight: ^0.7.0 json_view: ^0.4.2 super_sliver_list: ^0.4.1 - flutter_rust_bridge: ^2.3.0 + flutter_rust_bridge: ^2.4.0 rust_lib_mangayomi: path: rust_builder pseudom: ^1.0.1 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 16220bc..a5dcb7e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -482,9 +482,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13c1e57b460f7adbd6cbf8b4cd0a1d14238ed64f5cc2a6c2ccb7a605ac01354" +checksum = "6ff967a5893be60d849e4362910762acdc275febe44333153a11dcec1bca2cd2" dependencies = [ "allo-isolate", "android_logger", @@ -511,9 +511,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c85e62d6d34f5c1590af004ccd3dc45b1c726dba6721b632b164c19894fab4" +checksum = "d48b4d3fae9d29377b19134a38386d8792bde70b9448cde49e96391bcfc8fed1" dependencies = [ "hex", "md-5", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 31a9df7..849f793 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = { version = "=2.3.0", features = ["chrono"] } +flutter_rust_bridge = { version = "=2.4.0", features = ["chrono"] } image = "0.25.0" chrono = "0.4.38" futures-util = "0.3.30" reqwest = { version = "0.12.7", default-features = false, features = ["charset", "http2", "rustls-tls", "rustls-tls-native-roots", "stream", "multipart"] } tokio = { version = "1.39.3", features = ["full"] } -tokio-util = "0.7.11" \ No newline at end of file +tokio-util = "0.7.11" diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index 85b6597..a7f3fbc 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.3.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. #![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.3.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.4.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 107666026; // Section: executor @@ -671,6 +671,13 @@ impl SseDecode for i64 { } } +impl SseDecode for isize { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { + deserializer.cursor.read_i64::().unwrap() as _ + } +} + impl SseDecode for Vec> { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { @@ -1600,6 +1607,16 @@ impl SseEncode for i64 { } } +impl SseEncode for isize { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { + serializer + .cursor + .write_i64::(self as _) + .unwrap(); + } +} + impl SseEncode for Vec> { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { @@ -1888,7 +1905,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.3.0. + // @generated by `flutter_rust_bridge`@ 2.4.0. // Section: imports @@ -1940,7 +1957,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.3.0. + // @generated by `flutter_rust_bridge`@ 2.4.0. // Section: imports