Skip to content

Conversation

@sharder996
Copy link
Collaborator

@sharder996 sharder996 commented Jun 26, 2025

Mostly changes due to new linting rules in dart format.

Closes #3980
Closes #4095
Closes #4131
Closes #4132
Closes #4163


MULTI-1848

@codecov
Copy link

codecov bot commented Jun 26, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.31%. Comparing base (0fd67e9) to head (3a2a673).
⚠️ Report is 429 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4181   +/-   ##
=======================================
  Coverage   89.31%   89.31%           
=======================================
  Files         259      259           
  Lines       15684    15684           
=======================================
  Hits        14008    14008           
  Misses       1676     1676           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment on lines +90 to +97
# Copy the native assets provided by the build.dart from all packages.
set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/")
if(EXISTS "${NATIVE_ASSETS_DIR}")
install(DIRECTORY "${NATIVE_ASSETS_DIR}"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
endif()

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a review, but is this to workaround that flutter build issue on Windows?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe so. I went through the upgrade process as described in Andrei's handover doc while trying to preserve as much of Andrei's original work as possible, but I never encountered that bug as described in #165200. I can replicate the behaviour as described there, but didn't encounter it while upgrading.

The code block you referenced originally came from here. I'm not 100% sure why Andrei added it, but my best guess is that depending on what dependencies one has in their Flutter project, dart can generate native_assets. I did not notice any of these assets being generated from our project so I modified the install to only conditionally include the directory. Otherwise, the build process fails due to the directory not existing.

I am still doing some final verification, but so far I have not noticed any change in the operation of the GUI.

@sharder996 sharder996 requested review from levkropp and ricab June 27, 2025 15:02
@ricab ricab requested review from levkropp and xmkg and removed request for levkropp and ricab June 27, 2025 15:44
levkropp
levkropp previously approved these changes Jun 27, 2025
Copy link
Contributor

@levkropp levkropp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, no issues to be seen on my end! This would be great to merge ASAP because it affects dart format so existing GUI PRs would benefit from being rebased on the new flutter version

@sharder996
Copy link
Collaborator Author

@xmkg I will rerun linting commands, fix merge conflicts, and rebase once you've reviewed.

xmkg
xmkg previously approved these changes Jul 7, 2025
Copy link
Member

@xmkg xmkg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@sharder996 sharder996 dismissed stale reviews from xmkg and levkropp via 9b982b5 July 8, 2025 14:59
@sharder996 sharder996 force-pushed the flutter-3.32 branch 2 times, most recently from 9b982b5 to 836c18d Compare July 8, 2025 15:14
@sharder996 sharder996 changed the title [gui] update to flutter 3.32.4 [gui] update to flutter 3.32.5 Jul 8, 2025
@sharder996 sharder996 enabled auto-merge July 8, 2025 18:07
@sharder996 sharder996 added this pull request to the merge queue Jul 8, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 8, 2025
@sharder996 sharder996 added this pull request to the merge queue Jul 8, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jul 9, 2025
@sharder996 sharder996 added this pull request to the merge queue Jul 9, 2025
Merged via the queue into main with commit 43e7781 Jul 9, 2025
23 checks passed
@sharder996 sharder996 deleted the flutter-3.32 branch July 9, 2025 04:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants