Skip to content

Commit

Permalink
Merge branch 'master' into feat/11073
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.toml
#	README.md
#	frb_codegen/src/entrypoint/rust.rs
#	frb_dart/lib/src/ffigen_generated/multi_package.dart
#	frb_example/dart_minimal/pubspec.lock
#	frb_example/gallery/pubspec.lock
#	frb_example/pure_dart/dart/lib/bridge_definitions.dart
#	frb_example/pure_dart/dart/lib/bridge_generated.dart
#	frb_example/pure_dart/dart/lib/bridge_generated.io.dart
#	frb_example/pure_dart/dart/lib/bridge_generated.web.dart
#	frb_example/pure_dart/pubspec.lock
#	frb_example/pure_dart/pubspec.yaml
#	frb_example/pure_dart/rust/src/bridge_generated.rs
#	frb_example/pure_dart/rust/src/lib.rs
#	frb_example/pure_dart_multi/dart/lib/bridge_generated_api_1.dart
#	frb_example/pure_dart_multi/dart/lib/bridge_generated_api_1.io.dart
#	frb_example/pure_dart_multi/dart/lib/bridge_generated_api_1.web.dart
#	frb_example/pure_dart_multi/dart/lib/bridge_generated_api_2.dart
#	frb_example/pure_dart_multi/dart/lib/bridge_generated_api_2.io.dart
#	frb_example/pure_dart_multi/dart/lib/bridge_generated_api_2.web.dart
#	frb_example/pure_dart_multi/rust/src/generated_api_1.rs
#	frb_example/pure_dart_multi/rust/src/generated_api_2.rs
#	frb_example/with_flutter/lib/bridge_definitions.dart
#	frb_example/with_flutter/lib/bridge_generated.dart
#	frb_example/with_flutter/lib/bridge_generated.io.dart
#	frb_example/with_flutter/lib/bridge_generated.web.dart
#	frb_example/with_flutter/rust/src/bridge_generated.rs
#	justfile
  • Loading branch information
fzyzcjy committed Dec 18, 2023
2 parents 4a0fb1c + 1a5b35a commit 51be469
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository:
homepage: https://fzyzcjy.github.io/flutter_rust_bridge/

# A comma-separated list of topics to set on the repository
topics: dart, rust, ffi, flutter, bindgen, hacktoberfest
topics: dart, rust, ffi, flutter, bindgen

# Either `true` to make the repository private, or `false` to make it public.
private: false
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 1.82.6

* Bump README (since before 2.0 stable version, the 1.x will be the default page on pub.dev etc)

## 1.82.5

* Fix `rustfmt::skip` #1420 (thanks @rogurotus)

## 1.82.4

* Fix `Result<SyncReturn(T), E>` #1407 (thanks @rogurotus)
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exclude = [
]

[workspace.package]
version = "1.82.4"
version = "1.82.6"
edition = "2021"
license = "MIT"
description = "High-level memory-safe binding generator for Flutter/Dart <-> Rust"
Expand Down
2 changes: 1 addition & 1 deletion book/src/help.serve.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flutter_rust_bridge_serve 1.82.4
flutter_rust_bridge_serve 1.82.6
Develop Rust WASM modules with cross-origin isolation.

USAGE:
Expand Down
6 changes: 3 additions & 3 deletions frb_codegen/contrib/flutter_rust_bridge_codegen.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "1.82.4",
"version": "1.82.6",
"description": "High-level memory-safe binding generator for Flutter/Dart <-> Rust",
"homepage": "https://fzyzcjy.github.io/flutter_rust_bridge/",
"license": "MIT",
"architecture": {
"64bit": {
"url": "https://github.com/fzyzcjy/flutter_rust_bridge/releases/download/v1.82.4/flutter_rust_bridge_codegen-x86_64-pc-windows-msvc-v1.82.4.zip",
"url": "https://github.com/fzyzcjy/flutter_rust_bridge/releases/download/v1.82.6/flutter_rust_bridge_codegen-x86_64-pc-windows-msvc-v1.82.6.zip",
"hash": "Not Found"
},
"32bit": {
"url": "https://github.com/fzyzcjy/flutter_rust_bridge/releases/download/v1.82.4/flutter_rust_bridge_codegen-i686-pc-windows-msvc-v1.82.4.zip",
"url": "https://github.com/fzyzcjy/flutter_rust_bridge/releases/download/v1.82.6/flutter_rust_bridge_codegen-i686-pc-windows-msvc-v1.82.6.zip",
"hash": "Not Found"
}
},
Expand Down
2 changes: 1 addition & 1 deletion frb_dart/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: flutter_rust_bridge
description: High-level memory-safe binding generator for Flutter/Dart <-> Rust
version: 1.82.4
version: 1.82.6
repository: https://github.com/fzyzcjy/flutter_rust_bridge
environment:
sdk: ">=3.0.0 <4.0.0"
Expand Down

0 comments on commit 51be469

Please sign in to comment.