From 67051b425ac28744b12fb30ebbeac46363a34c44 Mon Sep 17 00:00:00 2001 From: MiaoMint <1981324730@qq.com> Date: Fri, 18 Aug 2023 03:09:48 +0800 Subject: [PATCH] Upgrade flutter 1.13.0 --- .github/workflows/release.yml | 2 +- pubspec.lock | 58 ++++++++++++++++++------------- pubspec.yaml | 8 ++--- windows/runner/flutter_window.cpp | 5 +++ 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 253b130d..64606af7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: - name: Flutter action uses: subosito/flutter-action@v2 with: - flutter-version: 3.10.3 + flutter-version: 3.13.0 channel: stable - name: Decode keystore run: | diff --git a/pubspec.lock b/pubspec.lock index 91eb43fd..e9599063 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" colorize: dependency: transitive description: @@ -325,10 +325,10 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" file_picker: dependency: "direct main" description: @@ -349,10 +349,10 @@ packages: dependency: "direct main" description: name: fluent_ui - sha256: "4a228a8d7dc93a1a8dc339cc99d439cf66ea5816285e76751ac5183f2ea10ced" + sha256: "0ec5ae618b42e6b9d0449d7519dec28c201809bc1955c5effb5a211dd77fa30e" url: "https://pub.dev" source: hosted - version: "4.7.2" + version: "4.7.3" flutter: dependency: "direct main" description: flutter @@ -561,10 +561,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -657,18 +657,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" math_expressions: dependency: transitive description: @@ -681,10 +681,10 @@ packages: dependency: "direct main" description: name: media_kit - sha256: "339a8e1b75ec957c439e6e0f5eb7a0bbf5900280e4048592364bbae832d28b49" + sha256: "0a89e7037002a62701ec319c375586849f9ef8e681820e1dd4a4ff7b843f7542" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.4+1" media_kit_libs_android_video: dependency: "direct main" description: @@ -729,10 +729,10 @@ packages: dependency: "direct main" description: name: media_kit_video - sha256: d9948ebc1986b24ca9c0541e04c5839a50186433861a266a7d1d6b8d2740d438 + sha256: e7fcbe426d42a78ad6696f8f557adb9cbdc012177829026d04992cc106a1c815 url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.5" meta: dependency: transitive description: @@ -1110,10 +1110,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: @@ -1190,26 +1190,26 @@ packages: dependency: transitive description: name: test - sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4" + sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" url: "https://pub.dev" source: hosted - version: "1.24.1" + version: "1.24.3" test_api: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" test_core: dependency: transitive description: name: test_core - sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93" + sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.5.3" time: dependency: transitive description: @@ -1402,6 +1402,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -1475,5 +1483,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.3 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index cccc2f76..6807dde1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: miru_app description: A new Flutter project. publish_to: "none" -version: 1.6.5+23 +version: 1.6.6+33 environment: sdk: ">=3.0.3 <4.0.0" @@ -12,7 +12,7 @@ dependencies: dio: ^5.3.2 dio_cookie_manager: ^3.1.0+1 easy_refresh: ^3.3.2+1 - fluent_ui: ^4.7.2 + fluent_ui: ^4.7.3 flutter: sdk: flutter flutter_animate: ^4.1.1+1 @@ -29,13 +29,13 @@ dependencies: isar: ^3.1.0+1 isar_flutter_libs: ^3.1.0+1 json_annotation: ^4.8.1 - media_kit: ^1.1.4 + media_kit: ^1.1.4+1 media_kit_libs_android_video: ^1.3.2 media_kit_libs_linux: ^1.1.1 media_kit_libs_macos_video: ^1.1.3 media_kit_libs_windows_video: ^1.0.7 media_kit_native_event_loop: ^1.0.7 - media_kit_video: ^1.1.4 + media_kit_video: ^1.1.5 package_info_plus: ^4.1.0 palette_generator: ^0.3.3+2 path: ^1.8.3 diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp index b25e363e..955ee303 100644 --- a/windows/runner/flutter_window.cpp +++ b/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; }