Skip to content

Commit 349070a

Browse files
committed
chore: Update project files after Flutter upgrade
1 parent 251bb24 commit 349070a

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

.metadata

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,23 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
8-
channel: main
7+
revision: "05ef4d31315f538bf0a60600e0e6efaf89acc6c2"
8+
channel: "main"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
17-
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
16+
create_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
17+
base_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
1818
- platform: android
19-
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
20-
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
21-
- platform: ios
22-
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
23-
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
24-
- platform: linux
25-
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
26-
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
27-
- platform: macos
28-
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
29-
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
30-
- platform: windows
31-
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
32-
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
19+
create_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
20+
base_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
3321

3422
# User provided section
3523

windows/flutter/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
1010
# https://github.com/flutter/flutter/issues/57146.
1111
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
1212

13+
# Set fallback configurations for older versions of the flutter tool.
14+
if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
15+
set(FLUTTER_TARGET_PLATFORM "windows-x64")
16+
endif()
17+
1318
# === Flutter Library ===
1419
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
1520

@@ -92,7 +97,7 @@ add_custom_command(
9297
COMMAND ${CMAKE_COMMAND} -E env
9398
${FLUTTER_TOOL_ENVIRONMENT}
9499
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
95-
windows-x64 $<CONFIG>
100+
${FLUTTER_TARGET_PLATFORM} $<CONFIG>
96101
VERBATIM
97102
)
98103
add_custom_target(flutter_assemble DEPENDS

windows/runner/flutter_window.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
3131
this->Show();
3232
});
3333

34+
// Flutter can complete the first frame before the "show window" callback is
35+
// registered. The following call ensures a frame is pending to ensure the
36+
// window is shown. It is a no-op if the first frame hasn't completed yet.
37+
flutter_controller_->ForceRedraw();
38+
3439
return true;
3540
}
3641

0 commit comments

Comments
 (0)