Skip to content

Commit 95384b1

Browse files
committed
Merge branch 'master' into video_filter
# Conflicts: # apps/nesium_flutter/pubspec.lock
2 parents d1286f1 + 332d6e3 commit 95384b1

4 files changed

Lines changed: 44 additions & 22 deletions

File tree

apps/nesium_flutter/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import desktop_multi_window
99
import file_picker
1010
import file_selector_macos
1111
import package_info_plus
12-
import path_provider_foundation
1312
import screen_retriever_macos
1413
import wakelock_plus
1514
import window_manager
@@ -19,7 +18,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1918
FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
2019
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
2120
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
22-
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
2321
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
2422
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
2523
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))

apps/nesium_flutter/pubspec.lock

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,14 @@ packages:
153153
url: "https://pub.flutter-io.cn"
154154
source: hosted
155155
version: "1.1.2"
156+
code_assets:
157+
dependency: transitive
158+
description:
159+
name: code_assets
160+
sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
161+
url: "https://pub.flutter-io.cn"
162+
source: hosted
163+
version: "1.0.0"
156164
code_builder:
157165
dependency: transitive
158166
description:
@@ -380,10 +388,10 @@ packages:
380388
dependency: "direct main"
381389
description:
382390
name: flutter_riverpod
383-
sha256: "38ec6c303e2c83ee84512f5fc2a82ae311531021938e63d7137eccc107bf3c02"
391+
sha256: a3cd0547353c1990bf5ad64f73143e5ce7a780409639559ad83a743ff3b945e4
384392
url: "https://pub.flutter-io.cn"
385393
source: hosted
386-
version: "3.1.0"
394+
version: "3.2.0"
387395
flutter_rust_bridge:
388396
dependency: "direct main"
389397
description:
@@ -463,6 +471,14 @@ packages:
463471
url: "https://pub.flutter-io.cn"
464472
source: hosted
465473
version: "1.1.0"
474+
hooks:
475+
dependency: transitive
476+
description:
477+
name: hooks
478+
sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7"
479+
url: "https://pub.flutter-io.cn"
480+
source: hosted
481+
version: "1.0.0"
466482
http:
467483
dependency: transitive
468484
description:
@@ -612,6 +628,14 @@ packages:
612628
url: "https://pub.flutter-io.cn"
613629
source: hosted
614630
version: "2.0.0"
631+
native_toolchain_c:
632+
dependency: transitive
633+
description:
634+
name: native_toolchain_c
635+
sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
636+
url: "https://pub.flutter-io.cn"
637+
source: hosted
638+
version: "0.17.4"
615639
node_preamble:
616640
dependency: transitive
617641
description:
@@ -620,6 +644,14 @@ packages:
620644
url: "https://pub.flutter-io.cn"
621645
source: hosted
622646
version: "2.0.2"
647+
objective_c:
648+
dependency: transitive
649+
description:
650+
name: objective_c
651+
sha256: "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537"
652+
url: "https://pub.flutter-io.cn"
653+
source: hosted
654+
version: "9.2.4"
623655
package_config:
624656
dependency: transitive
625657
description:
@@ -672,10 +704,10 @@ packages:
672704
dependency: transitive
673705
description:
674706
name: path_provider_foundation
675-
sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4"
707+
sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
676708
url: "https://pub.flutter-io.cn"
677709
source: hosted
678-
version: "2.5.1"
710+
version: "2.6.0"
679711
path_provider_linux:
680712
dependency: transitive
681713
description:
@@ -760,10 +792,10 @@ packages:
760792
dependency: transitive
761793
description:
762794
name: riverpod
763-
sha256: "16ff608d21e8ea64364f2b7c049c94a02ab81668f78845862b6e88b71dd4935a"
795+
sha256: "9026676260f31bb5279cc5e59ca292145d8bab4aabede9aa2555c2a626ec66f1"
764796
url: "https://pub.flutter-io.cn"
765797
source: hosted
766-
version: "3.1.0"
798+
version: "3.2.0"
767799
screen_retriever:
768800
dependency: transitive
769801
description:
@@ -853,18 +885,10 @@ packages:
853885
dependency: transitive
854886
description:
855887
name: source_gen
856-
sha256: "585bc140f20da42c584ece2df28f4d9ef2566955332b626f655957b3a8c8ad54"
857-
url: "https://pub.flutter-io.cn"
858-
source: hosted
859-
version: "4.1.2"
860-
source_helper:
861-
dependency: transitive
862-
description:
863-
name: source_helper
864-
sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
888+
sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
865889
url: "https://pub.flutter-io.cn"
866890
source: hosted
867-
version: "1.3.8"
891+
version: "4.2.0"
868892
source_map_stack_trace:
869893
dependency: transitive
870894
description:
@@ -1098,5 +1122,5 @@ packages:
10981122
source: hosted
10991123
version: "3.1.3"
11001124
sdks:
1101-
dart: ">=3.10.1 <4.0.0"
1102-
flutter: ">=3.38.0"
1125+
dart: ">=3.10.3 <4.0.0"
1126+
flutter: ">=3.38.4"

apps/nesium_flutter/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
flutter_localizations:
3434
sdk: flutter
3535
intl: ^0.20.2
36-
flutter_riverpod: ^3.1.0
36+
flutter_riverpod: ^3.2.0
3737
desktop_multi_window: ^0.3.0
3838
window_manager: 0.5.1
3939
flutter_rust_bridge: 2.11.1

crates/libretro-bridge/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ parking_lot.workspace = true
1616

1717
[build-dependencies]
1818
bindgen.workspace = true
19-
ureq = { workspace = true, features = ["rustls"] }
19+
ureq = { workspace = true }

0 commit comments

Comments
 (0)