diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 2ebc5ea..afecdba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target -/Cargo.lock \ No newline at end of file +/Cargo.lock +.direnv \ No newline at end of file diff --git a/example/bin/api.dart b/example/bin/api.dart index 3ce7c62..f4e21c1 100644 --- a/example/bin/api.dart +++ b/example/bin/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.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/example/bin/frb_generated.dart b/example/bin/frb_generated.dart index 108af60..7c87abf 100644 --- a/example/bin/frb_generated.dart +++ b/example/bin/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.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. // 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 @@ -51,7 +51,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0-dev.23'; + String get codegenVersion => '2.0.0-dev.27'; static const kDefaultExternalLibraryLoaderConfig = ExternalLibraryLoaderConfig( diff --git a/example/bin/frb_generated.io.dart b/example/bin/frb_generated.io.dart index 3d88d7e..d627d4a 100644 --- a/example/bin/frb_generated.io.dart +++ b/example/bin/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.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. // 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/example/bin/frb_generated.web.dart b/example/bin/frb_generated.web.dart index 28ae7e2..9b2389b 100644 --- a/example/bin/frb_generated.web.dart +++ b/example/bin/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-dev.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. // 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/example/pubspec.lock b/example/pubspec.lock index 6857bb1..e5216af 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: dart_internal - sha256: "689dccc3d5f62affd339534cca548dce12b3a6b32f0f10861569d3025efc0567" + sha256: "04145b91ccec450325fee75692b1ab62eb615e8892c334f0f4d31c696a857873" url: "https://pub.dev" source: hosted - version: "0.2.9" + version: "0.2.10" ffi: dependency: "direct main" description: @@ -125,10 +125,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: d0d366db59eead201fac6fd7e9ce1f6a291edb04dd3c2d8dd07e140b8e1a39b2 + sha256: "72ed9e781fb2a34ae209d18dcee38712269027f8292c8db93883d7d8f7ebff20" url: "https://pub.dev" source: hosted - version: "2.0.0-dev.23" + version: "2.0.0-dev.27" frontend_server_client: dependency: transitive description: @@ -434,4 +434,4 @@ packages: source: hosted version: "2.1.1" sdks: - dart: ">=3.0.5 <3.3.0" + dart: ">=3.0.5 <3.4.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c661531..0b067e8 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -9,7 +9,7 @@ environment: # Add regular dependencies here. dependencies: ffi: ^2.0.2 - flutter_rust_bridge: 2.0.0-dev.23 + flutter_rust_bridge: 2.0.0-dev.27 dev_dependencies: lints: ^2.0.0 diff --git a/example/run.sh b/example/run.sh index e4472b7..b68a56c 100755 --- a/example/run.sh +++ b/example/run.sh @@ -1,6 +1,6 @@ #! /bin/bash -cargo install 'flutter_rust_bridge_codegen@^2.0.0-dev.23' +cargo install 'flutter_rust_bridge_codegen@^2.0.0-dev.27' flutter_rust_bridge_codegen generate cd rust_lib && cargo build --release && cd .. dart run diff --git a/example/rust_lib/Cargo.lock b/example/rust_lib/Cargo.lock index f434650..830c3a0 100644 --- a/example/rust_lib/Cargo.lock +++ b/example/rust_lib/Cargo.lock @@ -185,9 +185,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.0.0-dev.23" +version = "2.0.0-dev.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453c3acdf45e47c95560295879fe9ba12d0c38f0b87ec761db12121183a95804" +checksum = "de520aa4b8fcb8e6cd67492a9de17e29e272daac98be05a97485d531a1d2dceb" dependencies = [ "allo-isolate", "android_logger", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.0.0-dev.23" +version = "2.0.0-dev.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1bdd33023eb83a27b29874dd33bb92035481a98039fb2664f31d229e98be8c9" +checksum = "e530c29aaf59c8ff9d3ba588956b4b29d93fcfdee213f422b0e6a76a1e632c6e" [[package]] name = "futures" @@ -319,9 +319,9 @@ checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -537,9 +537,9 @@ checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -547,9 +547,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -562,9 +562,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -574,9 +574,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -584,9 +584,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -597,9 +597,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" diff --git a/example/rust_lib/Cargo.toml b/example/rust_lib/Cargo.toml index f2d717d..84020d5 100644 --- a/example/rust_lib/Cargo.toml +++ b/example/rust_lib/Cargo.toml @@ -8,5 +8,5 @@ crate-type = ["cdylib", "staticlib"] [dependencies] flutter_logger = { path = "../../", features=["panic"]} -flutter_rust_bridge = "=2.0.0-dev.23" +flutter_rust_bridge = "=2.0.0-dev.27" log = "0.4.19" diff --git a/example/rust_lib/src/frb_generated.io.rs b/example/rust_lib/src/frb_generated.io.rs index a8a3b15..33e20c8 100644 --- a/example/rust_lib/src/frb_generated.io.rs +++ b/example/rust_lib/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.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. // Section: imports diff --git a/example/rust_lib/src/frb_generated.rs b/example/rust_lib/src/frb_generated.rs index 05de9fe..11cee57 100644 --- a/example/rust_lib/src/frb_generated.rs +++ b/example/rust_lib/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.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. #![allow( non_camel_case_types, @@ -30,7 +30,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.23"; +const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.27"; // Section: executor diff --git a/example/rust_lib/src/frb_generated.web.rs b/example/rust_lib/src/frb_generated.web.rs index 9ab62ad..c3693a1 100644 --- a/example/rust_lib/src/frb_generated.web.rs +++ b/example/rust_lib/src/frb_generated.web.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.23. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.27. // Section: imports diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..d7bc628 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..0cc5cad --- /dev/null +++ b/flake.nix @@ -0,0 +1,25 @@ +{ +description = "Flutter 3.13.x"; +inputs = { + nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; +}; +outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config = { + allowUnfree = true; + }; + }; + in + { + devShell = + with pkgs; mkShell rec { + buildInputs = [ + flutter + ]; + }; + }); +}