-
Notifications
You must be signed in to change notification settings - Fork 29.7k
v1.12.13+hotfix.2 cherry-picks #46055
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
v1.12.13+hotfix.2 cherry-picks #46055
Conversation
tvolkert
commented
Dec 4, 2019
- flutter/engine@6955b06 Cherry-picks for 1.12.13
- flutter/engine@3e6d6bc add pointer data santizing in flutter web engine
- 09126ab Enable Android embedding v2 on the beta, dev and stable channel
- 4c95bbd Re-enable hostonly tests on non-master branches
- 066a992 Ensure that docker tag is legal
- 4484ae4 [flutter_tool] Do not continue with a no-op 'upgrade'
|
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 |
|
81724bd is 9 days old - it's already included in the base release. |
|
sweet. Thanks! |
* '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
* flutter/engine@6955b06 Cherry-picks for 1.12.13 * flutter/engine@3e6d6bc add pointer data santizing in flutter web engine * 09126ab Enable Android embedding v2 on the beta, dev and stable channel * 4c95bbd Re-enable hostonly tests on non-master branches * 066a992 Ensure that docker tag is legal * 4484ae4 [flutter_tool] Do not continue with a no-op 'upgrade'
* flutter/engine@6955b06 Cherry-picks for 1.12.13 * flutter/engine@3e6d6bc add pointer data santizing in flutter web engine * 09126ab Enable Android embedding v2 on the beta, dev and stable channel * 4c95bbd Re-enable hostonly tests on non-master branches * 066a992 Ensure that docker tag is legal * 4484ae4 [flutter_tool] Do not continue with a no-op 'upgrade'