v1.12.13+hotfix.3 cherry-picks#46204
Merged
tvolkert merged 8 commits intoflutter:v1.12.13-hotfixesfrom Dec 6, 2019
tvolkert:v1.12.13-hotfixes
Merged
v1.12.13+hotfix.3 cherry-picks#46204tvolkert merged 8 commits intoflutter:v1.12.13-hotfixesfrom tvolkert:v1.12.13-hotfixes
tvolkert merged 8 commits intoflutter:v1.12.13-hotfixesfrom
tvolkert:v1.12.13-hotfixes
Conversation
Contributor
|
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 v1.12.13-hotfixes. See the Release Process for information about how other branches get updated. Reviewers: Use caution before merging pull requests to branches other than master. The circumstances where this is valid are very rare. /cc @dnfield |
fluttergithubbot
added
engine
Contributor
Author
Member
Yes, but actually another really bad bug already fixed in v1.13.0, exposed I believe by setting #45436 (specifically line 6b11f18#diff-77d60a41797d03aa9a7de0c742b17ef1R254) @tvolkert should we grab that change, too? Or do you want me to clean this up to the minimum possible fix? |
Member
|
I assume that was the merge conflict, too. |
Contributor
Author
|
Yeah that was the merged conflict. I applied it here (technically #45560) PTAL |
A-yum3
added a commit
to A-yum3/flutter
that referenced
this pull request
Jan 15, 2020
* 'v1.12.13-hotfixes' of github.com:Javateaboy/flutter: v1.12.13+hotfix.6 cherry-picks (flutter#46741) v1.12.13+hotfix.5 cherry-picks (flutter#46726) v1.12.13+hotfix.4 cherry-picks (flutter#46632) v1.12.13+hotfix.3 cherry-picks (flutter#46204) v1.12.13+hotfix.2 cherry-picks (flutter#46055) v1.12.13+hotfix.1 cherry-picks (flutter#45962) # Conflicts: # .cirrus.yml # bin/internal/engine.version # dev/devicelab/bin/tasks/build_ios_framework_module_test.dart # packages/flutter/lib/src/rendering/sliver_fill.dart # packages/flutter/lib/src/widgets/sliver.dart # packages/flutter/test/widgets/page_view_test.dart # packages/flutter_tools/gradle/flutter.gradle # packages/flutter_tools/lib/src/base/build.dart # packages/flutter_tools/lib/src/commands/build_ios_framework.dart # packages/flutter_tools/lib/src/commands/upgrade.dart # packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart # packages/flutter_tools/test/general.shard/base/build_test.dart # packages/flutter_tools/test/general.shard/features_test.dart
RaviKavaiya
pushed a commit
to RaviKavaiya/flutter
that referenced
this pull request
Jan 17, 2020
* flutter/engine@ac93919 v1.12.13+hotfix.3 cherry-picks * flutter/engine@73da385 Disable a11y on detach * d88345e only run codecov on master * 6d848eb Name the docker_builer shard * e98acc7 [flutter_tool] Print version info on a no-op upgrade * 8eb6a92 Always compile with isysroot on iOS to point to SDK root * fb69a39 Add bitcode and architectures to App.framework build ios framework command
responilla07
pushed a commit
to responilla07/flutter
that referenced
this pull request
Jun 8, 2020
* flutter/engine@ac93919 v1.12.13+hotfix.3 cherry-picks * flutter/engine@73da385 Disable a11y on detach * d88345e only run codecov on master * 6d848eb Name the docker_builer shard * e98acc7 [flutter_tool] Print version info on a no-op upgrade * 8eb6a92 Always compile with isysroot on iOS to point to SDK root * fb69a39 Add bitcode and architectures to App.framework build ios framework command
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
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.
Uh oh!
There was an error while loading. Please reload this page.