diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 3a4f6992e..f711651f1 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -1,3 +1,5 @@ +# cspell: words Zwasm + VERSION 0.8 IMPORT ../flutter AS flutter-ci @@ -31,7 +33,8 @@ CODE_GENERATOR_WEB: FUNCTION RUN flutter_rust_bridge_codegen generate --default-external-library-loader-web-prefix=/assets/packages/catalyst_key_derivation/assets/js/ - RUN flutter_rust_bridge_codegen build-web + # resolving a WASM compilation issue https://github.com/rust-lang/rust/issues/138762 + RUN flutter_rust_bridge_codegen build-web --wasm-pack-rustflags="-Zwasm-c-abi=legacy" RUN mkdir -p assets/js && cp -rf ./web/pkg/* assets/js/ # Don't want this gitignore file. diff --git a/earthly/rust/tools/Earthfile b/earthly/rust/tools/Earthfile index c46e433c2..f6638f87d 100644 --- a/earthly/rust/tools/Earthfile +++ b/earthly/rust/tools/Earthfile @@ -84,4 +84,4 @@ tool-wasm-pack: DO +CARGO_BINSTALL --package=wasm-pack --version=0.13.0 tool-flutter-rust-bridge-codegen: - DO +CARGO_BINSTALL --package=flutter_rust_bridge_codegen --version=2.5.1 --executable="flutter_rust_bridge_codegen" + DO +CARGO_BINSTALL --package=flutter_rust_bridge_codegen --version=2.9.0 --executable="flutter_rust_bridge_codegen" diff --git a/examples/flutter/example/pubspec.lock b/examples/flutter/example/pubspec.lock index 3d304ba99..2ff5d69f0 100644 --- a/examples/flutter/example/pubspec.lock +++ b/examples/flutter/example/pubspec.lock @@ -103,10 +103,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: "5fe868d3cb8cbc4d83091748552e03f00ccfa41b8e44691bc382611f831d5f8b" + sha256: "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.9.0" flutter_test: dependency: "direct dev" description: flutter @@ -311,5 +311,5 @@ packages: source: hosted version: "3.0.4" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.29.0" diff --git a/examples/flutter/example/pubspec.yaml b/examples/flutter/example/pubspec.yaml index 907155b9e..98472031f 100644 --- a/examples/flutter/example/pubspec.yaml +++ b/examples/flutter/example/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: cupertino_icons: ^1.0.6 rust_lib_example: path: rust_builder - flutter_rust_bridge: 2.5.1 + flutter_rust_bridge: 2.9.0 dev_dependencies: flutter_test: diff --git a/examples/flutter/example/rust/Cargo.toml b/examples/flutter/example/rust/Cargo.toml index 02114d4e0..99bf63932 100644 --- a/examples/flutter/example/rust/Cargo.toml +++ b/examples/flutter/example/rust/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = "=2.5.1" +flutter_rust_bridge = "=2.9.0"