Fix handling of generate lock files #172101
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cherry picks flutter#170034, as I think this is causing failures in flutter#170285, which bumps the Dart revision for the initial 3.34 beta release. As of today, this initial beta cut includes flutter#169273, which was reverted in flutter#170034 because of the failing `test/integration.shard/isolated/dart_data_asset_test.dart` test that is failing in flutter#170285. FYI @mosuem
As part of steps for creating initial beta release, rolls Dart to `3.9.0-196.1.beta` (dart-lang/sdk@b81ec2c). Part of flutter#170067.
…r#170481) Cherrypick 0cea361 (flutter#170448) to unblock the 3.34 release. Manual cherrypick because 3.34 is not an active release branch at the moment.
CP of flutter#170490 This PR rolls back auto-migrating iOS apps to UIScene lifecycle. It also updates tests to ensure things work in both a state where UIScene lifecycle is already adopted and when it isn't. A number of UIScene issues have emerged since landing this in master: flutter#170171 In addition, there's is disagreement over how some of it is implemented. Impacted Users: All Flutter iOS developers Impact Description: Some method channels may crash and apps using app lifecycle events may not work properly. Workaround: Manually removing UIApplicationSceneManifest from Info.plist and potentially also update AppDelegate.swift. Risk: Low Test Coverage: Yes Validation Steps: Run `flutter build ios` and see that `UIApplicationSceneManifest` if not added to Info.plist.
…#170744) This pull request is created by [automatic cherry pick workflow](https://github.com/flutter/flutter/blob/main/docs/releases/Flutter-Cherrypick-Process.md#automatically-creates-a-cherry-pick-request) Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request. ### Issue Link: What is the link to the issue this cherry-pick is addressing? dart-lang/sdk#60289 ### Changelog Description: Explain this cherry pick in one line that is accessible to most Flutter developers. See [best practices](https://github.com/flutter/flutter/blob/main/docs/releases/Hotfix-Documentation-Best-Practices.md) for examples Automatically disable `web-experimental-hot-reload` when running flutter using `web-server` device. ### Impact Description: What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch) Without this fix apps launched with`flutter run -d web-server` do not load in the browser. The app is never started. ### Workaround: Is there a workaround for this issue? You can work around the issue by passing the same argument that this cherry pick automatically adds: `flutter run -d web-server --no-web-experimental-hot-reload`. ### Risk: What is the risk level of this cherry-pick? ### Test Coverage: Are you confident that your fix is well-tested by automated tests? ### Validation Steps: What are the steps to validate that this fix works? `flutter run -d web-server` and verify that the app can be loaded in a web browser.
|
This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to beta. See the Release Process for information about how other branches get updated. Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick. |
justinmc
reviewed
Jul 14, 2025
There was a problem hiding this comment.
Thank you for quickly jumping on this!
- This makes sense to me, but I'll defer to someone with more Android knowledge like @reidbaker. Possibly this still requires a test.
- I think the typical way to get this onto
betais to merge it intomasterfirst and then follow the cherry pick process to get it intobeta. CC @matanlurey.
matanlurey
requested changes
Jul 14, 2025
|
Confirmed this needs to be merged to master first. |
This comment was marked as outdated.
This comment was marked as outdated.
9 tasks
|
I found some time already here is the PR for the master: #172124 |
eb3ca25 to
d86b4e9
Compare
|
I'm closing this PR since it should go the normal route via the master branch. I'm also working on a test which revealed that there is another bug hidden which I aim to fix too. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While preparing a migration guide for supporting Dart and Kotlin files in one Android Studio instance I noticed that within #167332 a wrong exception was caught. This results in the exception mentioned in #172093 and this PR also fixes #172093
For the review the exception within gradle is thrown here:
Pre-launch Checklist
///).