Skip to content

Commit

Permalink
Merge pull request #2445 from fzyzcjy/feat/12674
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
fzyzcjy authored Dec 10, 2024
2 parents 962b638 + 737b770 commit 2e04107
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 400 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## 2.7.0

* Please refer to https://fzyzcjy.github.io/flutter_rust_bridge/guides/miscellaneous/whats-new for what's changed in V2.
* Remove default case in enums #2439 (thanks @Tienisto)
* Switch from dart-sys-fork to dart-sys #2438 (thanks @evdokimovs)
* Fix call build-web with fvm support #2429 (thanks @SirKrlos)
* Replaced WASM header exception with warning #2423 (thanks @CJBuchel)
* Fix Option Box compilation error in DCO codec #2398
* Fix call toolchain version with fvm support #2395 (thanks @SirKrlos)
* Doc update and linting: #2423 (thanks @CJBuchel), #2422, #2421, #2349 (thanks @ernstvanderlinden), #2394

## 2.6.0

* Please refer to https://fzyzcjy.github.io/flutter_rust_bridge/guides/miscellaneous/whats-new for what's changed in V2.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resolver = "2"
version = "2.6.0"
edition = "2021"
license = "MIT"
description = "High-level memory-safe binding generator for Flutter/Dart <-> Rust"
description = "Flutter/Dart <-> Rust binding generator, feature-rich, but seamless and simple"
repository = "https://github.com/fzyzcjy/flutter_rust_bridge"
keywords = ["flutter", "dart", "ffi", "code-generation", "bindings"]
categories = ["development-tools::ffi"]
Expand Down
7 changes: 6 additions & 1 deletion frb_codegen/src/library/build_web/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
use crate::command_run;
use crate::library::commands::command_runner::{call_shell, call_shell_info, check_exit_code};
use crate::library::commands::fvm::command_arg_maybe_fvm;
use crate::utils::dart_repository::dart_repo::DartRepository;
use crate::utils::path_utils::{find_dart_package_dir, path_to_string};
use anyhow::{bail, Context};
Expand Down Expand Up @@ -71,7 +72,11 @@ fn dart_run(
args: Vec<String>,
) -> anyhow::Result<ExitStatus> {
let handle = {
let mut cmd_args: Vec<PathBuf> = vec!["dart".into()];
let mut cmd_args: Vec<PathBuf> = if command_arg_maybe_fvm(None).is_some() {
vec!["fvm".into(), "dart".into()]
} else {
vec!["dart".into()]
};
cmd_args.extend(repo.command_extra_args().into_iter().map_into());
cmd_args.push("run".into());
if dart_coverage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub(crate) fn generate_enum_encode_rust_general(
lang.switch_expr(
self_ref,
&variants,
Some(format!("{};", lang.throw_unimplemented(""))),
matches!(lang, Lang::RustLang(_)).then(|| format!("{};", lang.throw_unimplemented(""))),
)
}

Expand Down
4 changes: 1 addition & 3 deletions frb_codegen/src/library/utils/logs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ pub fn configure_opinionated_logging(path: &str, verbose: bool) -> Result<(), fe
.level(LevelFilter::Info)
.level_for("cbindgen", LevelFilter::Error)
.chain(std::io::stdout()),
// frb-coverage:ignore-start
_ => panic!("only allow \"debug\" or \"info\""),
// frb-coverage:ignore-end
_ => fern_logger.level(level_filter).chain(std::io::stdout()),
};

let (max_level, fern_logger) = fern_logger.into_log();
Expand Down
2 changes: 1 addition & 1 deletion frb_dart/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: flutter_rust_bridge
description: High-level memory-safe binding generator for Flutter/Dart <-> Rust
description: Flutter/Dart <-> Rust binding generator, feature-rich, but seamless and simple
version: 2.6.0
repository: https://github.com/fzyzcjy/flutter_rust_bridge
environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26491,8 +26491,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
case AudioContextLatencyCategory_Custom(field0: final field0):
sse_encode_i_32(3, serializer);
sse_encode_f_64(field0, serializer);
default:
throw UnimplementedError('');
}
}

Expand Down Expand Up @@ -26618,8 +26616,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
sse_encode_i_32(22, serializer);
sse_encode_AutoExplicit_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWaveShaperNode(
field0, serializer);
default:
throw UnimplementedError('');
}
}

Expand Down Expand Up @@ -26849,8 +26845,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
sse_encode_i_32(31, serializer);
sse_encode_AutoExplicit_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerStereoPannerNode(
field0, serializer);
default:
throw UnimplementedError('');
}
}

Expand All @@ -26867,8 +26861,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
sse_encode_i_32(0, serializer);
sse_encode_AutoExplicit_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerMediaStreamAudioDestinationNode(
field0, serializer);
default:
throw UnimplementedError('');
}
}

Expand Down
Loading

0 comments on commit 2e04107

Please sign in to comment.