From ee7da179c10c1698eae76066b3c4840403e974f4 Mon Sep 17 00:00:00 2001 From: Levi Date: Wed, 29 Nov 2023 13:32:07 +0800 Subject: [PATCH] chore: upgrade flutter to v3.16.1 (#282) --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- ui/flutter/lib/theme/theme.dart | 4 +- ui/flutter/pubspec.lock | 46 ++++++++++++-------- ui/flutter/windows/flutter/CMakeLists.txt | 7 ++- ui/flutter/windows/runner/flutter_window.cpp | 5 +++ 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eeb808458..9a1f4f1dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ on: env: GO_VERSION: "1.19" - FLUTTER_VERSION: "3.10.6" + FLUTTER_VERSION: "3.16.1" permissions: contents: write diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ffaec7db5..668b5f5ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ on: env: GO_VERSION: "1.19" - FLUTTER_VERSION: "3.10.6" + FLUTTER_VERSION: "3.16.1" jobs: # lint: diff --git a/Dockerfile b/Dockerfile index efe8bdf90..d5a8d5591 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM instrumentisto/flutter:3.10.6 AS flutter +FROM instrumentisto/flutter:3.16.1 AS flutter WORKDIR /app COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./ RUN flutter pub get diff --git a/ui/flutter/lib/theme/theme.dart b/ui/flutter/lib/theme/theme.dart index 6c0e20789..258264ead 100644 --- a/ui/flutter/lib/theme/theme.dart +++ b/ui/flutter/lib/theme/theme.dart @@ -26,14 +26,14 @@ class GopeedTheme { }); static final _light = ThemeData( - //TODO useMaterial3: true, + useMaterial3: false, brightness: Brightness.light, primarySwatch: _gopeedreen); static final light = _light.copyWith( colorScheme: _light.colorScheme.copyWith(secondary: _gopeedreenAccent)); static final _dark = ThemeData( - //TODO useMaterial3: true, + useMaterial3: false, brightness: Brightness.dark, primarySwatch: _gopeedreen); static final dark = _dark.copyWith( diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock index 7467f616e..a83427f2e 100644 --- a/ui/flutter/pubspec.lock +++ b/ui/flutter/pubspec.lock @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.flutter-io.cn" source: hosted - version: "1.17.1" + version: "1.18.0" context_menus: dependency: "direct main" description: @@ -441,10 +441,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.flutter-io.cn" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -537,18 +537,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.flutter-io.cn" 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.flutter-io.cn" source: hosted - version: "0.2.0" + version: "0.5.0" math_expressions: dependency: transitive description: @@ -569,10 +569,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -894,10 +894,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.10.0" sprintf: dependency: transitive description: @@ -910,18 +910,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -958,10 +958,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.flutter-io.cn" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -1083,6 +1083,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1140,5 +1148,5 @@ packages: source: hosted version: "2.1.1" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/ui/flutter/windows/flutter/CMakeLists.txt b/ui/flutter/windows/flutter/CMakeLists.txt index 930d2071a..903f4899d 100644 --- a/ui/flutter/windows/flutter/CMakeLists.txt +++ b/ui/flutter/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS diff --git a/ui/flutter/windows/runner/flutter_window.cpp b/ui/flutter/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/ui/flutter/windows/runner/flutter_window.cpp +++ b/ui/flutter/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; }