diff --git a/lib/common/conf/const_conf.dart b/lib/common/conf/const_conf.dart index fd3b2ba..e5ac32f 100644 --- a/lib/common/conf/const_conf.dart +++ b/lib/common/conf/const_conf.dart @@ -1,6 +1,6 @@ class ConstConf { - static const String appVersion = "2.10.10 Beta"; - static const int appVersionCode = 45; + static const String appVersion = "2.11.0 Beta"; + static const int appVersionCode = 46; static const String appVersionDate = "2024-03-30"; static const gameChannels = ["LIVE", "PTU", "EPTU", "TECH-PREVIEW"]; static const isMSE = diff --git a/lib/common/rust/api/http_api.dart b/lib/common/rust/api/http_api.dart index 6a293be..c257dc8 100644 --- a/lib/common/rust/api/http_api.dart +++ b/lib/common/rust/api/http_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -42,4 +42,5 @@ enum MyMethod { trace, connect, patch, + ; } diff --git a/lib/common/rust/api/process_api.dart b/lib/common/rust/api/process_api.dart index ba7ad3b..4b77ce0 100644 --- a/lib/common/rust/api/process_api.dart +++ b/lib/common/rust/api/process_api.dart @@ -1,12 +1,12 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import import '../frb_generated.dart'; import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; -Future> startProcess( +Stream startProcess( {required String executable, required List arguments, required String workingDirectory, diff --git a/lib/common/rust/frb_generated.dart b/lib/common/rust/frb_generated.dart index 45cf6e1..1a38d32 100644 --- a/lib/common/rust/frb_generated.dart +++ b/lib/common/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-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. // 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,10 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0-dev.31'; + String get codegenVersion => '2.0.0-dev.32'; + + @override + int get rustContentHash => 593879172; static const kDefaultExternalLibraryLoaderConfig = ExternalLibraryLoaderConfig( @@ -79,7 +82,7 @@ abstract class RustLibApi extends BaseApi { Future setDefaultHeader( {required Map headers, dynamic hint}); - Future> startProcess( + Stream startProcess( {required String executable, required List arguments, required String workingDirectory, @@ -198,13 +201,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { ); @override - Future> startProcess( + Stream startProcess( {required String executable, required List arguments, required String workingDirectory, - dynamic hint}) async { + dynamic hint}) { final streamSink = RustStreamSink(); - await handler.executeNormal(NormalTask( + unawaited(handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_String(executable); var arg1 = cst_encode_list_String(arguments); @@ -220,7 +223,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { argValues: [executable, arguments, workingDirectory, streamSink], apiImpl: this, hint: hint, - )); + ))); return streamSink.stream; } diff --git a/lib/common/rust/frb_generated.io.dart b/lib/common/rust/frb_generated.io.dart index 7617522..ba54dda 100644 --- a/lib/common/rust/frb_generated.io.dart +++ b/lib/common/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-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. // 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/common/rust/http_package.dart b/lib/common/rust/http_package.dart index 3fd4a02..e34c8bd 100644 --- a/lib/common/rust/http_package.dart +++ b/lib/common/rust/http_package.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -13,6 +13,7 @@ enum MyHttpVersion { http2, http3, httpUnknown, + ; } class RustHttpResponse { diff --git a/lib/provider/aria2c.dart b/lib/provider/aria2c.dart index 09573a3..b1263df 100644 --- a/lib/provider/aria2c.dart +++ b/lib/provider/aria2c.dart @@ -98,7 +98,7 @@ class Aria2cModel extends _$Aria2cModel { dPrint("trackerList === $trackerList"); dPrint("Aria2cManager .----- aria2c start $port------"); - final stream = await rs_process.startProcess( + final stream = rs_process.startProcess( executable: exePath, arguments: [ "-V", diff --git a/pubspec.yaml b/pubspec.yaml index cbef5ec..83c6eba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -62,7 +62,7 @@ dependencies: flutter_tilt: ^3.0.0 card_swiper: ^3.0.1 ffi: ^2.1.0 - flutter_rust_bridge: ^2.0.0-dev.31 + flutter_rust_bridge: ^2.0.0-dev.32 freezed_annotation: ^2.4.1 meta: ^1.9.1 win32: ^5.0.9 diff --git a/rust/Cargo.toml b/rust/Cargo.toml index b3b3d4f..32fa7a3 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -11,7 +11,7 @@ strip = "debuginfo" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = "=2.0.0-dev.31" +flutter_rust_bridge = "=2.0.0-dev.32" tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "process"] } url = "2.5" async-std = "1.12" diff --git a/rust/src/frb_generated.io.rs b/rust/src/frb_generated.io.rs index 997dd91..11e8e1d 100644 --- a/rust/src/frb_generated.io.rs +++ b/rust/src/frb_generated.io.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. // Section: imports diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index 2eb8438..2e44761 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-dev.31. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32. #![allow( non_camel_case_types, @@ -30,7 +30,8 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueNom, default_rust_auto_opaque = RustAutoOpaqueNom, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.31"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.32"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 593879172; // Section: executor