Skip to content
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

Roll engine to version b148e628ec86b3a9a0382e0bcfae73f0390a8232 #20427

Merged
merged 10 commits into from
Aug 15, 2018

Conversation

mkustermann
Copy link
Member

This includes:

Roll Dart to version be6309690fd60284a87f3258a740c7c30efb1092 (#5987)

@aam
Copy link
Member

aam commented Aug 10, 2018

There seems to be issues with mockito package:

╰─➤  bin/flutter doctor                                                                                                               130 ↵
Building flutter tool...
The current Dart SDK version is 2.1.0-dev.0.0.flutter-be6309690f.

Because flutter_tools depends on mockito >=0.8.1 <3.0.0-beta+3 which requires SDK version >=1.0.0 <2.0.0-∞, version solving failed.
Error: Unable to 'pub upgrade' flutter tool. Retrying in five seconds...

@mkustermann
Copy link
Member Author

Turns out Siva's roll in the engine wasn't further rolled into flutter/flutter yet.

Doing this will require upgrading all 3rd party packages in pubspec files to be compatible with Dart 2, since this roll includes a new version number, namely 2.1.0-dev.0.0.

I've tried to find all the necessary package upgrades and filed issues for:

So far.

@mkustermann mkustermann changed the title Roll engine to version 2ab499d917c51768da8ec84b0547a463fe6cee52 Roll engine to version b148e628ec86b3a9a0382e0bcfae73f0390a8232 Aug 14, 2018
'matcher': '0.12.2+1', // TODO(ianh): https://github.com/flutter/flutter/issues/18608, https://github.com/dart-lang/matcher/pull/88
'flutter_gallery_assets': '0.1.4', // See //examples/flutter_gallery/pubspec.yaml
'mockito': '3.0.0',
'matcher': '0.12.3+1', // TODO(ianh): https://github.com/flutter/flutter/issues/18608
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't do this. It's a breaking change for our users.

Copy link
Member Author

Choose a reason for hiding this comment

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

Guess this issue has been resolved already by #20602

@@ -1075,6 +1075,7 @@ String _generateFakePubspec(Iterable<PubspecDependency> dependencies) {
if (!dependency.pointsToSdk)
dependency.describeForFakePubspec(result, overrides);
result.write(overrides.toString());
//print('XXXX: ${result.toString()}');
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: commented out code

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

…ter_tester will crash very deeply inside Dart VM
@mkustermann
Copy link
Member Author

The SEGV crash in the flutter_tester binary crashed very deeply inside the Dart VM when doing a constant evaluation inside package:test code.

After debugging this for a while it became clear that this is due to a missing platform file, which caused the VM to fall back to code paths which it should never fall back to in a Dart 2.0 world.

The root cause was flutter/engine@a84b210 which renamed the platform file the flutter_tester binary expects, but a corresponding change in flutter wasn't done yet.

@mkustermann
Copy link
Member Author

Since the engine->flutter roll also brings in new skia changes, I've made flutter/goldens#11 to update the goldens.

@mraleph
Copy link
Member

mraleph commented Aug 15, 2018

still LGTM

@mkustermann
Copy link
Member Author

mkustermann commented Aug 15, 2018

The existing redness on the flutter dashboard needs to be investigated, e.g. I can see e.g. stderr: > Java heap space in this log, but I think it makes sense to land this now, since there are already more engine commits waiting to be rolled in. Hope that this is ok.

@mkustermann mkustermann merged commit c7c493e into flutter:master Aug 15, 2018
@mkustermann mkustermann deleted the roll branch August 15, 2018 13:22
mkustermann added a commit that referenced this pull request Aug 15, 2018
mkustermann added a commit that referenced this pull request Aug 15, 2018
Reason for revert: The package:flutter_gallery_assets has removed some images which are required for the examples/flutter_gallery, so the gallery build is failing (only discovered after landing, since gallery doesn't seem to get built during github PR presubmit checks)
mkustermann added a commit to mkustermann/flutter that referenced this pull request Aug 15, 2018
This is a re-land with downgraded `package:flutter_gallery_assets`
version.
jonahwilliams pushed a commit that referenced this pull request Aug 15, 2018
* Reland "Roll engine to version b148e62 (#20427)"

This is a re-land with downgraded `package:flutter_gallery_assets`
version.

* Downgrade package:flutter_gallery_assets to 0.1.4

* Change engine.version to 81baff9 (which contains an additional fix)

* Change engine.version to e3687f7 (since mac tarballs are corrupted on earlier commit)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants