diff --git a/.fvmrc b/.fvmrc index 906bbb34..ff263c64 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.24.3" + "flutter": "3.24.4" } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index d3ea72b3..5a3ea55a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "dart.flutterSdkPath": ".fvm/versions/3.24.3", + "dart.flutterSdkPath": ".fvm/versions/3.24.4", "editor.formatOnSave": true, "explorer.fileNesting.enabled": true, "explorer.fileNesting.expand": false, diff --git a/lib/i18n/aria/aria_ja-JP.i18n.yaml b/lib/i18n/aria/aria_ja-JP.i18n.yaml index e5bca166..48b7776d 100644 --- a/lib/i18n/aria/aria_ja-JP.i18n.yaml +++ b/lib/i18n/aria/aria_ja-JP.i18n.yaml @@ -38,6 +38,7 @@ emojiPickerScale: "絵文字ピッカーのサイズ" emojiPickerUseDialog: "絵文字ピッカーをダイアログにする" enableEmojiFadeIn: "カスタム絵文字のフェードインを有効にする" enableFederation: "連合ありにする" +enablePredictiveBack: "予測型「戻る」アニメーションを有効にする" endpoint: "エンドポイント" expandNote: "ノートを開く" extraMentionsWarning: "返信元のノートには含まれていないメンションがあります" @@ -62,6 +63,7 @@ media: "メディア" mentionToRemoteWarning: "リモートユーザーへのメンションが含まれています" moved: "移動しました" muted: "ミュート中" +mutedEmojis: "ミュートした絵文字" nFiles: one: "{n}個のファイル" other: "{n}個のファイル" diff --git a/lib/i18n/aria/aria_ja-KS.i18n.yaml b/lib/i18n/aria/aria_ja-KS.i18n.yaml index d12c716c..da237878 100644 --- a/lib/i18n/aria/aria_ja-KS.i18n.yaml +++ b/lib/i18n/aria/aria_ja-KS.i18n.yaml @@ -38,6 +38,7 @@ emojiPickerScale: "絵文字ピッカーのでかさ" emojiPickerUseDialog: "絵文字ピッカーをダイアログで表示するで" enableEmojiFadeIn: "カスタム絵文字のフェードインを有効にするで" enableFederation: "連合ありにするで" +enablePredictiveBack: "予測型「戻る」アニメーションを有効にするで" endpoint: "エンドポイント" expandNote: "ノートを開くで" extraMentionsWarning: "返信元のノートには入ってへんメンションがあるで" @@ -62,6 +63,7 @@ media: "メディア" mentionToRemoteWarning: "リモートユーザーへのメンションがあるで" moved: "移したで" muted: "ミュート中" +mutedEmojis: "ミュートしとる絵文字" nFiles: one: "{n}個のファイル" other: "{n}個のファイル" diff --git a/lib/i18n/aria/aria_ko-KR.i18n.yaml b/lib/i18n/aria/aria_ko-KR.i18n.yaml index eb5925b5..c432842b 100644 --- a/lib/i18n/aria/aria_ko-KR.i18n.yaml +++ b/lib/i18n/aria/aria_ko-KR.i18n.yaml @@ -85,13 +85,16 @@ openInBrowser: "브라우저에서 열기" openInExternalBrowser: "외부 브라우저에서 열기" openInInternalBrowser: "내부 브라우저에서 열기" openMenu: "메뉴 열기" +openScratchpadAndRunCode(rich): "{scratchpad} 를 브라우저에서 열고, 다음 코드를 클릭한 다음 실행하세요." openSensitiveMediaOnDoubleTap: "더블 탭하여 민감한 미디어 열기" parameters: "매개변수" paste: "붙여넣기" pastePinnedEmojisDescription(rich): "이모지를 고정하려면 Json파일을 붙여넣기 해야합니다.\n{url}에서 미스키 웹용으로 고정된 이모지를 복사할 수 있습니다." +pasteResponseBelow: "답변을 아래 복사하세요" pinToEmojiPicker: "이모지 선택기에 고정" playAudio: "소리 재생" playVideo: "동영상 재생" +pleaseCopyResponse: "이 답변을 복사하세요" postConfirm: "이 노트를 게시하시겠습니까?" reactionConfirm: "리액션을 추가하시겠습니까?" renoteConfirm: "이 노트를 리노트하시겠습니까?" @@ -124,6 +127,7 @@ showShowPostFormFAB: "미니포스트 양식 플로팅 동작 버튼 표시" showStackTrace: "스택 트레이스 표시" showSubNoteFooter: "서브노트 내 버튼 표시" showSubNoteReactionsViewer: "서브노트 내 리액션 뷰어 표시" +showTabHeaderInOneLine: "탭 정보를 한 줄로 표시" showTimelineLastViewedAt: "타임라인 마지막으로 본 날짜 표시" showTimelineTabBarAtBottom: "타임라인 탭 바를 하단에 표시" showTranslateButtonInNoteFooter: "노트 동작에 번역을 추가" diff --git a/lib/i18n/strings.g.dart b/lib/i18n/strings.g.dart index 3c7e71d4..7fa3bea9 100644 --- a/lib/i18n/strings.g.dart +++ b/lib/i18n/strings.g.dart @@ -4,7 +4,7 @@ /// To regenerate, run: `dart run slang` /// /// Locales: 31 -/// Strings: 54610 (1761 per locale) +/// Strings: 54618 (1761 per locale) // coverage:ignore-file // ignore_for_file: type=lint, unused_import diff --git a/lib/i18n/strings_ja_JP.g.dart b/lib/i18n/strings_ja_JP.g.dart index 53530f5d..0a483281 100644 --- a/lib/i18n/strings_ja_JP.g.dart +++ b/lib/i18n/strings_ja_JP.g.dart @@ -89,6 +89,7 @@ class _TranslationsAriaJaJp extends TranslationsAriaEnUs { @override String get emojiPickerUseDialog => '絵文字ピッカーをダイアログにする'; @override String get enableEmojiFadeIn => 'カスタム絵文字のフェードインを有効にする'; @override String get enableFederation => '連合ありにする'; + @override String get enablePredictiveBack => '予測型「戻る」アニメーションを有効にする'; @override String get endpoint => 'エンドポイント'; @override String get expandNote => 'ノートを開く'; @override String get extraMentionsWarning => '返信元のノートには含まれていないメンションがあります'; @@ -126,6 +127,7 @@ class _TranslationsAriaJaJp extends TranslationsAriaEnUs { @override String get mentionToRemoteWarning => 'リモートユーザーへのメンションが含まれています'; @override String get moved => '移動しました'; @override String get muted => 'ミュート中'; + @override String get mutedEmojis => 'ミュートした絵文字'; @override String nFiles({required num n}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('ja'))(n, one: '${n}個のファイル', other: '${n}個のファイル', diff --git a/lib/i18n/strings_ja_KS.g.dart b/lib/i18n/strings_ja_KS.g.dart index 6333a4a1..ab8b2bdd 100644 --- a/lib/i18n/strings_ja_KS.g.dart +++ b/lib/i18n/strings_ja_KS.g.dart @@ -89,6 +89,7 @@ class _TranslationsAriaJaKs extends TranslationsAriaEnUs { @override String get emojiPickerUseDialog => '絵文字ピッカーをダイアログで表示するで'; @override String get enableEmojiFadeIn => 'カスタム絵文字のフェードインを有効にするで'; @override String get enableFederation => '連合ありにするで'; + @override String get enablePredictiveBack => '予測型「戻る」アニメーションを有効にするで'; @override String get endpoint => 'エンドポイント'; @override String get expandNote => 'ノートを開くで'; @override String get extraMentionsWarning => '返信元のノートには入ってへんメンションがあるで'; @@ -126,6 +127,7 @@ class _TranslationsAriaJaKs extends TranslationsAriaEnUs { @override String get mentionToRemoteWarning => 'リモートユーザーへのメンションがあるで'; @override String get moved => '移したで'; @override String get muted => 'ミュート中'; + @override String get mutedEmojis => 'ミュートしとる絵文字'; @override String nFiles({required num n}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('ja'))(n, one: '${n}個のファイル', other: '${n}個のファイル', diff --git a/lib/i18n/strings_ko_KR.g.dart b/lib/i18n/strings_ko_KR.g.dart index c7bf9ffa..02ba8eac 100644 --- a/lib/i18n/strings_ko_KR.g.dart +++ b/lib/i18n/strings_ko_KR.g.dart @@ -153,6 +153,10 @@ class _TranslationsAriaKoKr extends TranslationsAriaEnUs { @override String get openInExternalBrowser => '외부 브라우저에서 열기'; @override String get openInInternalBrowser => '내부 브라우저에서 열기'; @override String get openMenu => '메뉴 열기'; + @override TextSpan openScratchpadAndRunCode({required InlineSpan scratchpad}) => TextSpan(children: [ + scratchpad, + const TextSpan(text: ' 를 브라우저에서 열고, 다음 코드를 클릭한 다음 실행하세요.'), + ]); @override String get openSensitiveMediaOnDoubleTap => '더블 탭하여 민감한 미디어 열기'; @override String get parameters => '매개변수'; @override String get paste => '붙여넣기'; @@ -161,9 +165,11 @@ class _TranslationsAriaKoKr extends TranslationsAriaEnUs { url, const TextSpan(text: '에서 미스키 웹용으로 고정된 이모지를 복사할 수 있습니다.'), ]); + @override String get pasteResponseBelow => '답변을 아래 복사하세요'; @override String get pinToEmojiPicker => '이모지 선택기에 고정'; @override String get playAudio => '소리 재생'; @override String get playVideo => '동영상 재생'; + @override String get pleaseCopyResponse => '이 답변을 복사하세요'; @override String get postConfirm => '이 노트를 게시하시겠습니까?'; @override String get reactionConfirm => '리액션을 추가하시겠습니까?'; @override String get renoteConfirm => '이 노트를 리노트하시겠습니까?'; @@ -205,6 +211,7 @@ class _TranslationsAriaKoKr extends TranslationsAriaEnUs { @override String get showStackTrace => '스택 트레이스 표시'; @override String get showSubNoteFooter => '서브노트 내 버튼 표시'; @override String get showSubNoteReactionsViewer => '서브노트 내 리액션 뷰어 표시'; + @override String get showTabHeaderInOneLine => '탭 정보를 한 줄로 표시'; @override String get showTimelineLastViewedAt => '타임라인 마지막으로 본 날짜 표시'; @override String get showTimelineTabBarAtBottom => '타임라인 탭 바를 하단에 표시'; @override String get showTranslateButtonInNoteFooter => '노트 동작에 번역을 추가'; diff --git a/lib/rust/api/aiscript.dart b/lib/rust/api/aiscript.dart index a4997a15..6b62d611 100644 --- a/lib/rust/api/aiscript.dart +++ b/lib/rust/api/aiscript.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/rust/api/aiscript/api.dart b/lib/rust/api/aiscript/api.dart index 153a3733..23e339d8 100644 --- a/lib/rust/api/aiscript/api.dart +++ b/lib/rust/api/aiscript/api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/rust/api/aiscript/play.dart b/lib/rust/api/aiscript/play.dart index cf07a354..dd00f210 100644 --- a/lib/rust/api/aiscript/play.dart +++ b/lib/rust/api/aiscript/play.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/rust/api/aiscript/ui.dart b/lib/rust/api/aiscript/ui.dart index 170d2e01..1159d986 100644 --- a/lib/rust/api/aiscript/ui.dart +++ b/lib/rust/api/aiscript/ui.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/rust/frb_generated.dart b/lib/rust/frb_generated.dart index ccf3da27..8ea37d39 100644 --- a/lib/rust/frb_generated.dart +++ b/lib/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.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // 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 @@ -66,7 +66,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.5.0'; + String get codegenVersion => '2.5.1'; @override int get rustContentHash => -463493403; diff --git a/lib/rust/frb_generated.io.dart b/lib/rust/frb_generated.io.dart index fb8dbc83..29ce8f98 100644 --- a/lib/rust/frb_generated.io.dart +++ b/lib/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.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // 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/rust/frb_generated.web.dart b/lib/rust/frb_generated.web.dart index 6d961777..20cf4282 100644 --- a/lib/rust/frb_generated.web.dart +++ b/lib/rust/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.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. // 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/pubspec.lock b/pubspec.lock index 4f19101d..ef58fb40 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -774,10 +774,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71" + sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35" url: "https://pub.dev" source: hosted - version: "17.2.3" + version: "17.2.4" flutter_local_notifications_linux: dependency: transitive description: @@ -827,10 +827,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287" + sha256: "5fe868d3cb8cbc4d83091748552e03f00ccfa41b8e44691bc382611f831d5f8b" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.1" flutter_secure_storage: dependency: "direct main" description: @@ -1330,10 +1330,10 @@ packages: dependency: "direct main" description: name: multi_split_view - sha256: "30548c5e4cc6f24d5d4ca784dc5dff80d599ef1f704b1565819eb88a74f0eb62" + sha256: "99c02f128e7423818d13b8f2e01e3027e953b35508019dcee214791bd0525db5" url: "https://pub.dev" source: hosted - version: "3.5.0" + version: "3.6.0" nested: dependency: transitive description: @@ -1402,10 +1402,10 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "45f7d6bba1128761de5540f39d5ca000ea8a1f22f06b76b61094a60a2997bd0e" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" path_provider: dependency: transitive description: @@ -1625,18 +1625,18 @@ packages: dependency: "direct main" description: name: searchfield - sha256: "6ae29d79f9aa648f59a50ed8616704e6a2118b228fda5ad3af3520d8208b41d4" + sha256: "837721576ca1de1ce40c9841760e40cd7452d3068ea2a22a7b25d06133a7d989" url: "https://pub.dev" source: hosted - version: "1.1.6" + version: "1.1.7" share_plus: dependency: "direct main" description: name: share_plus - sha256: "334fcdf0ef9c0df0e3b428faebcac9568f35c747d59831474b2fc56e156d244e" + sha256: "3af2cda1752e5c24f2fc04b6083b40f013ffe84fb90472f30c6499a9213d5442" url: "https://pub.dev" source: hosted - version: "10.1.0" + version: "10.1.1" share_plus_platform_interface: dependency: transitive description: @@ -1726,26 +1726,26 @@ packages: dependency: "direct main" description: name: slang - sha256: f1da602c879fe7f2ea399faff1003a540c6adb745b5f603a9ab0c7275cd0b428 + sha256: b04db2dbaf927b28600a2f8a272a3bf2ae309556dcc5d6beb02d66af0be39e4c url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" slang_build_runner: dependency: "direct dev" description: name: slang_build_runner - sha256: "9120c69f934895ba3d743e2c01f05d33103e85a944fc453d45306d85f40f9f69" + sha256: "6338653769ab088ad222e84b1f382fffb867a9a3ead802960aa4d0ab45a62f5f" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" slang_flutter: dependency: "direct main" description: name: slang_flutter - sha256: cc5d079107365e04842419d24bda6e22d1576331a5ac877734efd3b9e926860d + sha256: "59988f37bb8b50d96ee46832a8a389036c0da26c04b1b1d4aa6690c00f70eccf" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" source_gen: dependency: transitive description: @@ -1992,10 +1992,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2" + sha256: "0dea215895a4d254401730ca0ba8204b29109a34a99fb06ae559a2b60988d2de" url: "https://pub.dev" source: hosted - version: "6.3.12" + version: "6.3.13" url_launcher_ios: dependency: transitive description: @@ -2096,10 +2096,10 @@ packages: dependency: transitive description: name: video_player_android - sha256: "2800d68d6d5b4c22da62453568ed68e63c35bea524d4fa42062e53d6bb591433" + sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898" url: "https://pub.dev" source: hosted - version: "2.7.13" + version: "2.7.16" video_player_avfoundation: dependency: transitive description: @@ -2120,10 +2120,10 @@ packages: dependency: transitive description: name: video_player_web - sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774" + sha256: "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.3" vm_service: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 42d12bde..25ad8c26 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: aria description: "A client app for Misskey, a federated social media platform." publish_to: 'none' -version: 1.0.0-beta.4+48 +version: 1.0.0-beta.5+49 environment: sdk: '>=3.5.0 <4.0.0' @@ -38,11 +38,11 @@ dependencies: flutter_image_compress: ^2.3.0 flutter_inappwebview: ^6.1.5 flutter_inset_box_shadow: ^1.0.8 - flutter_local_notifications: ^17.2.3 + flutter_local_notifications: ^17.2.4 flutter_localizations: sdk: flutter flutter_math_fork: ^0.7.2 - flutter_rust_bridge: ^2.5.0 + flutter_rust_bridge: ^2.5.1 flutter_secure_storage: ^9.2.2 flutter_svg: ^2.0.10+1 fluttertoast: ^8.2.8 @@ -74,7 +74,7 @@ dependencies: git: url: https://github.com/poppingmoon/misskey_dart ref: 103efab93cce466ffc1a3ff792b8d33fb1843c40 - multi_split_view: ^3.5.0 + multi_split_view: ^3.6.0 package_info_plus: ^8.1.0 photo_view: ^0.15.0 punycode: ^1.0.0 @@ -84,11 +84,11 @@ dependencies: riverpod_annotation: ^2.6.1 rust_lib_aria: path: rust_builder - searchfield: ^1.1.6 - share_plus: ^10.1.0 + searchfield: ^1.1.7 + share_plus: ^10.1.1 shared_preferences: ^2.3.2 - slang: ^4.0.0 - slang_flutter: ^4.0.0 + slang: ^4.1.0 + slang_flutter: ^4.1.0 tinycolor2: git: url: https://github.com/poppingmoon/tinycolor2 @@ -125,7 +125,7 @@ dev_dependencies: lint: ^2.3.0 riverpod_generator: ^2.6.1 riverpod_lint: ^2.6.1 - slang_build_runner: ^4.0.0 + slang_build_runner: ^4.1.0 yaml: ^3.1.2 dependency_overrides: diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b04b579e..4910584e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "allo-isolate" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b6d794345b06592d0ebeed8e477e41b71e5a0a49df4fc0e4184d5938b99509" +checksum = "1f67642eb6773fb42a95dd3b348c305ee18dee6642274c6b412d67e985e3befc" dependencies = [ "anyhow", "atomic", @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "atomic" @@ -154,9 +154,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -166,9 +166,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.25" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d9e0b4957f635b8d3da819d0db5603620467ecf1f692d22a8c2717ce27e6d8" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "shlex", ] @@ -277,9 +277,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "flutter_rust_bridge" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a06af75bcc46b5443c2293f99fda22819e816f8a5f5bea04c72f8cb04a106a" +checksum = "2f052ec223b70cbdf2248376a9ad5af9281b3fdf8ea3c7d3f66fff52a9aaf1fa" dependencies = [ "allo-isolate", "android_logger", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9250f0a18500e7825617ddb677bccf1336a2fe4c4edf6c6ce7717967ed67f42e" +checksum = "23414fe526f51870c6d89d27bbffbee52ebe0900164a4147b32caf1d3e131682" dependencies = [ "hex", "md-5", @@ -492,9 +492,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -507,9 +507,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "log" @@ -622,9 +622,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -649,9 +649,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -697,9 +697,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -750,18 +750,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", @@ -770,9 +770,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap", "itoa", @@ -798,9 +798,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -809,18 +809,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", @@ -838,9 +838,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "pin-project-lite", @@ -866,9 +866,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", ] @@ -887,9 +887,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -898,9 +898,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -913,9 +913,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -925,9 +925,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -935,9 +935,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -948,15 +948,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 263d44f8..d959e264 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib", "staticlib"] [dependencies] aiscript = { git = "https://github.com/poppingmoon/aiscript-rs", rev = "6e8ce4330eb2b4a2878cf799ca702ce9f76b0875" } -flutter_rust_bridge = "=2.5.0" +flutter_rust_bridge = "=2.5.1" futures = "0.3" indexmap = "2.3" serde_json = { version = "1.0", features = ["preserve_order"] } diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index 71992a33..273eb2af 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.5.0. +// @generated by `flutter_rust_bridge`@ 2.5.1. #![allow( non_camel_case_types, @@ -39,7 +39,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.5.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.5.1"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -463493403; // Section: executor @@ -3242,7 +3242,7 @@ impl SseEncode for i32 { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.5.0. + // @generated by `flutter_rust_bridge`@ 2.5.1. // Section: imports @@ -3407,7 +3407,7 @@ pub use io::*; #[cfg(target_family = "wasm")] mod web { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.5.0. + // @generated by `flutter_rust_bridge`@ 2.5.1. // Section: imports