From b89b550d203fddd1839cd75e915e3c2e97757d45 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Wed, 28 Oct 2015 12:01:24 -0700 Subject: [PATCH 1/8] Stop excluding sky/packages/sky during pub update There's no need to exclude it anymore. --- DEPS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 07c59fcdf1..bfb353cfce 100644 --- a/DEPS +++ b/DEPS @@ -255,8 +255,7 @@ hooks = [ 'src/sky/tools/dart_pub_get.py', '--repository-root', '../..', '--dart-sdk-directory', - '../../third_party/dart-sdk/dart-sdk', - '--dirs-to-ignore', 'sky/packages/sky', + '../../third_party/dart-sdk/dart-sdk' ], }, { From fb7520756e036d39d28002f3c6868c0045866bf3 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Wed, 28 Oct 2015 15:52:34 -0400 Subject: [PATCH 2/8] Add some unit tests for flx signing code. --- .../flutter/sky/packages/flx/lib/signing.dart | 53 ++++++++++--------- .../src/flutter/sky/packages/flx/pubspec.yaml | 2 +- .../sky/packages/workbench/pubspec.yaml | 3 ++ 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/engine/src/flutter/sky/packages/flx/lib/signing.dart b/engine/src/flutter/sky/packages/flx/lib/signing.dart index a95e076679..c9a1a0668f 100644 --- a/engine/src/flutter/sky/packages/flx/lib/signing.dart +++ b/engine/src/flutter/sky/packages/flx/lib/signing.dart @@ -4,7 +4,6 @@ import 'dart:async'; import 'dart:convert'; -import 'dart:math'; import 'dart:io'; import 'dart:typed_data'; @@ -44,7 +43,7 @@ final CipherParameters _params = _initParams(); Uint8List serializeManifest(Map manifestDescriptor, ECPublicKey publicKey, Uint8List zipBytes) { if (manifestDescriptor == null) return null; - final List kSavedKeys = [ + final List kSavedKeys = [ 'name', 'version', 'update-url' @@ -66,9 +65,9 @@ Uint8List serializeManifest(Map manifestDescriptor, ECPublicKey publicKey, Uint8 } // Returns the ASN.1 encoded signature of the input manifestBytes. -List signManifest(Uint8List manifestBytes, ECPrivateKey privateKey) { +Uint8List signManifest(Uint8List manifestBytes, ECPrivateKey privateKey) { if (manifestBytes == null || privateKey == null) - return []; + return new Uint8List(0); Signer signer = new Signer(_params.signerAlgorithm); PrivateKeyParameter params = new PrivateKeyParameter(privateKey); signer.init(true, new ParametersWithRandom(params, _params.random)); @@ -121,26 +120,22 @@ ECPrivateKey _asn1ParsePrivateKey(ECDomainParameters ecDomain, Uint8List private // Parses a DER-encoded ASN.1 ECDSA signature block. ECSignature _asn1ParseSignature(Uint8List signature) { - ASN1Parser parser = new ASN1Parser(signature); - ASN1Object object = parser.nextObject(); - if (object is! ASN1Sequence) + try { + ASN1Parser parser = new ASN1Parser(signature); + ASN1Object object = parser.nextObject(); + if (object is! ASN1Sequence) + return null; + ASN1Sequence sequence = object; + if (!(sequence.elements.length == 2 && + sequence.elements[0] is ASN1Integer && + sequence.elements[1] is ASN1Integer)) + return null; + ASN1Integer r = sequence.elements[0]; + ASN1Integer s = sequence.elements[1]; + return new ECSignature(r.valueAsPositiveBigInteger, s.valueAsPositiveBigInteger); + } on ASN1Exception { return null; - ASN1Sequence sequence = object; - if (!(sequence.elements.length == 2 && - sequence.elements[0] is ASN1Integer && - sequence.elements[1] is ASN1Integer)) - return null; - ASN1Integer r = sequence.elements[0]; - ASN1Integer s = sequence.elements[1]; - return new ECSignature(r.valueAsPositiveBigInteger, s.valueAsPositiveBigInteger); -} - -ECPrivateKey _readPrivateKeySync(String privateKeyPath) { - File file = new File(privateKeyPath); - if (!file.existsSync()) - return null; - List bytes = file.readAsBytesSync(); - return _asn1ParsePrivateKey(_params.domain, new Uint8List.fromList(bytes)); + } } ECPublicKey _publicKeyFromPrivateKey(ECPrivateKey privateKey) { @@ -154,8 +149,16 @@ class KeyPair { ECPublicKey publicKey; ECPrivateKey privateKey; - static KeyPair readFromPrivateKeySync(String path) { - ECPrivateKey privateKey = _readPrivateKeySync(path); + static KeyPair readFromPrivateKeySync(String privateKeyPath) { + File file = new File(privateKeyPath); + if (!file.existsSync()) + return null; + return fromPrivateKeyBytes(file.readAsBytesSync()); + } + + static KeyPair fromPrivateKeyBytes(List privateKeyBytes) { + ECPrivateKey privateKey = _asn1ParsePrivateKey( + _params.domain, new Uint8List.fromList(privateKeyBytes)); if (privateKey == null) return null; diff --git a/engine/src/flutter/sky/packages/flx/pubspec.yaml b/engine/src/flutter/sky/packages/flx/pubspec.yaml index d7a947fea7..acaae9e47f 100644 --- a/engine/src/flutter/sky/packages/flx/pubspec.yaml +++ b/engine/src/flutter/sky/packages/flx/pubspec.yaml @@ -1,5 +1,5 @@ name: flx -version: 0.0.1 +version: 0.0.2 author: Flutter Authors description: Library for dealing with Flutter bundle (.flx) files homepage: http://flutter.io diff --git a/engine/src/flutter/sky/packages/workbench/pubspec.yaml b/engine/src/flutter/sky/packages/workbench/pubspec.yaml index 57040de79a..759be72f63 100644 --- a/engine/src/flutter/sky/packages/workbench/pubspec.yaml +++ b/engine/src/flutter/sky/packages/workbench/pubspec.yaml @@ -11,6 +11,7 @@ dependencies: flutter_rendering_examples: any flutter_sprites: any playfair: any + flx: any dependency_overrides: material_design_icons: path: ../material_design_icons @@ -20,5 +21,7 @@ dependency_overrides: path: ../../../examples/rendering flutter_sprites: path: ../../../skysprites + flx: + path: ../flx environment: sdk: '>=1.8.0 <2.0.0' From b85168787ec8b091250ccdb81cfee9dd65250167 Mon Sep 17 00:00:00 2001 From: Hixie Date: Wed, 28 Oct 2015 13:51:30 -0700 Subject: [PATCH 3/8] rev-flutter tool A tool to update all the pubspec.yaml versions when we're revving flutter. --- .../flutter/sky/packages/updater/pubspec.yaml | 1 - .../sky/packages/workbench/pubspec.yaml | 2 +- .../tools/pubspec_maintenance/pubspec.yaml | 5 + .../pubspec_maintenance/rev_flutter.dart | 110 ++++++++++++++++++ 4 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 engine/src/flutter/sky/tools/pubspec_maintenance/pubspec.yaml create mode 100755 engine/src/flutter/sky/tools/pubspec_maintenance/rev_flutter.dart diff --git a/engine/src/flutter/sky/packages/updater/pubspec.yaml b/engine/src/flutter/sky/packages/updater/pubspec.yaml index 0608368ddd..1048fb8f7e 100644 --- a/engine/src/flutter/sky/packages/updater/pubspec.yaml +++ b/engine/src/flutter/sky/packages/updater/pubspec.yaml @@ -1,5 +1,4 @@ name: updater -version: 0.0.1 author: Flutter Authors description: The autoupdater for flutter homepage: http://flutter.io diff --git a/engine/src/flutter/sky/packages/workbench/pubspec.yaml b/engine/src/flutter/sky/packages/workbench/pubspec.yaml index 759be72f63..1a5795f2b9 100644 --- a/engine/src/flutter/sky/packages/workbench/pubspec.yaml +++ b/engine/src/flutter/sky/packages/workbench/pubspec.yaml @@ -5,7 +5,7 @@ description: A workspace to host pub packages homepage: https://github.com/flutter/engine/tree/master/sky/packages/workbench dependencies: flutter: ">=0.0.3 <0.1.0" - sky_tools: ">=0.0.26" + sky_tools: any cipher: any asn1lib: any flutter_rendering_examples: any diff --git a/engine/src/flutter/sky/tools/pubspec_maintenance/pubspec.yaml b/engine/src/flutter/sky/tools/pubspec_maintenance/pubspec.yaml new file mode 100644 index 0000000000..26363d091e --- /dev/null +++ b/engine/src/flutter/sky/tools/pubspec_maintenance/pubspec.yaml @@ -0,0 +1,5 @@ +name: flutter-pubspec-maintenance +dependencies: + den_api: ^0.1.0 + path: ^1.3.6 + pub_semver: ^1.2.2 diff --git a/engine/src/flutter/sky/tools/pubspec_maintenance/rev_flutter.dart b/engine/src/flutter/sky/tools/pubspec_maintenance/rev_flutter.dart new file mode 100755 index 0000000000..757e928c1f --- /dev/null +++ b/engine/src/flutter/sky/tools/pubspec_maintenance/rev_flutter.dart @@ -0,0 +1,110 @@ +import 'dart:async'; +import 'dart:io'; + +import 'package:den_api/den_api.dart'; +import 'package:path/path.dart' as path; +import 'package:pub_semver/pub_semver.dart'; + +// set this to true when we decide to ship 0.1.0 +const bool haveWeEverReleasedAPointRelease = false; + +class FlutterPubspec { + static Future load(String path) async { + return new FlutterPubspec.fromPubspec(await Pubspec.load(path)); + } + + FlutterPubspec.fromPubspec(this._data) { + _openPubspecs.add(this); + } + + final Pubspec _data; + + String get name => _data.name; + Version get version => _data.version; + + PackageDep get asDependency { + return new PackageDep(name, 'hosted', version, ''); + } + + void bumpVersion({ bool breakingChange }) { + _data.bump(haveWeEverReleasedAPointRelease && breakingChange ? ReleaseType.minor : ReleaseType.patch); + print('$name is now at $version'); + } + + void setDependency(FlutterPubspec dependency) { + _data.addDependency(dependency.asDependency); + } + + void setDependencyIfNecessary(FlutterPubspec dependency) { + if (_data.dependencies.containsKey(dependency.name)) + _data.addDependency(dependency.asDependency); + } + + void _save() { + _data.save(); + } + + static List _openPubspecs = []; + static void saveAll() { + for (FlutterPubspec file in _openPubspecs) + file._save(); + } +} + +main() async { + bool breakingChange = true; + + + // The published packages + + FlutterPubspec flutterEngine = await FlutterPubspec.load('sky/packages/sky_engine') + ..bumpVersion(breakingChange: breakingChange); + + FlutterPubspec flutterServices = await FlutterPubspec.load('sky/packages/sky_services') + ..bumpVersion(breakingChange: breakingChange); + + FlutterPubspec flutterFlx = await FlutterPubspec.load('sky/packages/flx') + ..bumpVersion(breakingChange: breakingChange) + ..setDependency(flutterServices); + + FlutterPubspec flutter = await FlutterPubspec.load('sky/packages/sky') + ..bumpVersion(breakingChange: breakingChange) + ..setDependency(flutterEngine) + ..setDependency(flutterServices); + + FlutterPubspec flutterSprites = await FlutterPubspec.load('skysprites') + ..bumpVersion(breakingChange: breakingChange) + ..setDependency(flutter); + + + // The internal packages + + await FlutterPubspec.load('sky/packages/updater') + ..setDependency(flutter) + ..setDependency(flutterSprites); + + await FlutterPubspec.load('sky/unit') + ..setDependency(flutter); + + await FlutterPubspec.load('sky/packages/workbench') + ..setDependency(flutterServices) + ..setDependency(flutterFlx) + ..setDependency(flutter) + ..setDependency(flutterSprites); + + Directory examples = new Directory('examples'); + await for (FileSystemEntity entity in examples.list(recursive: true, followLinks: false)) { + if (entity is File && path.basename(entity.path) == Pubspec.basename) { + await FlutterPubspec.load(entity.path) + ..setDependency(flutter) + ..setDependencyIfNecessary(flutterSprites); + } + } + + // we don't update these, since they're their own things and don't depend on + // the above packages: + // sky/tools/pubspec_maintenance/pubspec.yaml + // sky/packages/material_design_icons/pubspec.yaml + + FlutterPubspec.saveAll(); +} From deccd853c6344de3c3f2f4e9599fe1b6b969136c Mon Sep 17 00:00:00 2001 From: Hixie Date: Fri, 23 Oct 2015 09:56:50 -0700 Subject: [PATCH 4/8] Rev the Dart SDK to pick up better dartdocs --- engine/src/flutter/sky/tools/skyanalyzer | 2 +- engine/src/flutter/tools/dart/update.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/sky/tools/skyanalyzer b/engine/src/flutter/sky/tools/skyanalyzer index 6d781dcfb6..fc2ae42548 100755 --- a/engine/src/flutter/sky/tools/skyanalyzer +++ b/engine/src/flutter/sky/tools/skyanalyzer @@ -25,7 +25,7 @@ _IGNORED_PATTERNS = [ re.compile(r'^$'), re.compile(r'^Analyzing \['), re.compile(r'^No issues found'), - re.compile(r'^[0-9]+ (error|warning|hint).*found\.'), + re.compile(r'^[0-9]+ (error|warning|hint|lint).*found\.'), # We still have some parts in our code, so silence the warnings that come from trying to analyze them directly. re.compile(r'^Only libraries can be analyzed\.$'), diff --git a/engine/src/flutter/tools/dart/update.py b/engine/src/flutter/tools/dart/update.py index ce2715cdd3..f6790fc623 100755 --- a/engine/src/flutter/tools/dart/update.py +++ b/engine/src/flutter/tools/dart/update.py @@ -18,7 +18,7 @@ import sys # How to roll the dart sdk: Just change this url! We write this to the stamp # file after we download, and then check the stamp file for differences. SDK_URL_BASE = ('http://gsdview.appspot.com/dart-archive/channels/dev/raw/' - '1.13.0-dev.6.0/sdk/') + '1.13.0-dev.7.4/sdk/') LINUX_64_SDK = 'dartsdk-linux-x64-release.zip' MACOS_64_SDK = 'dartsdk-macos-x64-release.zip' From 90ce09ab495ce2913d9242c0a45e232ba3494979 Mon Sep 17 00:00:00 2001 From: Hixie Date: Wed, 28 Oct 2015 14:54:33 -0700 Subject: [PATCH 5/8] Rev package versions for release. sky_engine is now at 0.0.44 sky_services is now at 0.0.44 flx is now at 0.0.3 flutter is now at 0.0.14 flutter_sprites is now at 0.0.11 --- engine/src/flutter/examples/address_book/pubspec.yaml | 3 ++- engine/src/flutter/examples/hello_world/pubspec.yaml | 3 ++- engine/src/flutter/examples/mine_digger/pubspec.yaml | 3 ++- engine/src/flutter/sky/packages/flx/pubspec.yaml | 5 +++-- .../src/flutter/sky/packages/sky_engine/pubspec.yaml | 2 +- .../flutter/sky/packages/sky_services/pubspec.yaml | 2 +- engine/src/flutter/sky/packages/updater/pubspec.yaml | 5 ++++- .../src/flutter/sky/packages/workbench/pubspec.yaml | 11 ++++++++--- 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/engine/src/flutter/examples/address_book/pubspec.yaml b/engine/src/flutter/examples/address_book/pubspec.yaml index 30a73e7546..22ac0489c7 100644 --- a/engine/src/flutter/examples/address_book/pubspec.yaml +++ b/engine/src/flutter/examples/address_book/pubspec.yaml @@ -1,6 +1,7 @@ name: address_book dependencies: - flutter: ">=0.0.3 <0.1.0" + flutter: + '0.0.14' sky_tools: any dependency_overrides: material_design_icons: diff --git a/engine/src/flutter/examples/hello_world/pubspec.yaml b/engine/src/flutter/examples/hello_world/pubspec.yaml index 7cdd0bc0d6..b93e699fd4 100644 --- a/engine/src/flutter/examples/hello_world/pubspec.yaml +++ b/engine/src/flutter/examples/hello_world/pubspec.yaml @@ -1,6 +1,7 @@ name: hello_world dependencies: - flutter: ">=0.0.3 <0.1.0" + flutter: + '0.0.14' sky_tools: any dependency_overrides: material_design_icons: diff --git a/engine/src/flutter/examples/mine_digger/pubspec.yaml b/engine/src/flutter/examples/mine_digger/pubspec.yaml index b07705c15a..2b35c303ff 100644 --- a/engine/src/flutter/examples/mine_digger/pubspec.yaml +++ b/engine/src/flutter/examples/mine_digger/pubspec.yaml @@ -1,6 +1,7 @@ name: mine_digger dependencies: - flutter: ">=0.0.3 <0.1.0" + flutter: + '0.0.14' sky_tools: any dependency_overrides: material_design_icons: diff --git a/engine/src/flutter/sky/packages/flx/pubspec.yaml b/engine/src/flutter/sky/packages/flx/pubspec.yaml index acaae9e47f..1fd13d604c 100644 --- a/engine/src/flutter/sky/packages/flx/pubspec.yaml +++ b/engine/src/flutter/sky/packages/flx/pubspec.yaml @@ -1,10 +1,11 @@ name: flx -version: 0.0.2 +version: 0.0.3 author: Flutter Authors description: Library for dealing with Flutter bundle (.flx) files homepage: http://flutter.io dependencies: - sky_services: ^0.0.40 + sky_services: + '0.0.44' yaml: ^2.1.3 asn1lib: ^0.4.1 cipher: ^0.7.1 diff --git a/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml b/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml index 2b8ea1c94d..f773e9fb0f 100644 --- a/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml +++ b/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml @@ -1,5 +1,5 @@ name: sky_engine -version: 0.0.43 +version: 0.0.44 author: Flutter Authors description: Dart SDK extensions for dart:ui homepage: http://flutter.io diff --git a/engine/src/flutter/sky/packages/sky_services/pubspec.yaml b/engine/src/flutter/sky/packages/sky_services/pubspec.yaml index 7fafb729fd..b7c2cac36a 100644 --- a/engine/src/flutter/sky/packages/sky_services/pubspec.yaml +++ b/engine/src/flutter/sky/packages/sky_services/pubspec.yaml @@ -1,5 +1,5 @@ name: sky_services -version: 0.0.43 +version: 0.0.44 author: Flutter Authors description: Mojom interfaces associated with Flutter homepage: http://flutter.io diff --git a/engine/src/flutter/sky/packages/updater/pubspec.yaml b/engine/src/flutter/sky/packages/updater/pubspec.yaml index 1048fb8f7e..4ac63702f1 100644 --- a/engine/src/flutter/sky/packages/updater/pubspec.yaml +++ b/engine/src/flutter/sky/packages/updater/pubspec.yaml @@ -4,11 +4,14 @@ description: The autoupdater for flutter homepage: http://flutter.io dependencies: mojo: 0.3.0 - flutter: ">=0.0.3 <0.1.0" + flutter: + '0.0.14' sky_services: ^0.0.40 yaml: ^2.1.3 path: ^1.3.0 flx: 0.0.1 + flutter_sprites: + '0.0.11' dependency_overrides: flutter: path: ../sky diff --git a/engine/src/flutter/sky/packages/workbench/pubspec.yaml b/engine/src/flutter/sky/packages/workbench/pubspec.yaml index 1a5795f2b9..0971ac9131 100644 --- a/engine/src/flutter/sky/packages/workbench/pubspec.yaml +++ b/engine/src/flutter/sky/packages/workbench/pubspec.yaml @@ -4,14 +4,19 @@ author: Flutter Authors description: A workspace to host pub packages homepage: https://github.com/flutter/engine/tree/master/sky/packages/workbench dependencies: - flutter: ">=0.0.3 <0.1.0" + flutter: + '0.0.14' sky_tools: any cipher: any asn1lib: any flutter_rendering_examples: any - flutter_sprites: any + flutter_sprites: + '0.0.11' playfair: any - flx: any + flx: + '0.0.3' + sky_services: + '0.0.44' dependency_overrides: material_design_icons: path: ../material_design_icons From 1e90452f45b60f5774bff7a3c6e4365b99b08bb4 Mon Sep 17 00:00:00 2001 From: Hixie Date: Wed, 28 Oct 2015 15:06:58 -0700 Subject: [PATCH 6/8] Ignore files from gclient sync for rev_flutter --- engine/src/flutter/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/src/flutter/.gitignore b/engine/src/flutter/.gitignore index 8533eba87a..b8ce069136 100644 --- a/engine/src/flutter/.gitignore +++ b/engine/src/flutter/.gitignore @@ -68,3 +68,5 @@ Thumbs.db /mojo/common/dart/packages /sky/packages/**/packages /sky/packages/sky_services/lib/ +/sky/tools/pubspec_maintenance/packages/ +/sky/tools/pubspec_maintenance/pubspec.lock From 7a9ef3ccacdbc91621c9627d1c6d5f3136fa82b2 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Thu, 29 Oct 2015 10:47:34 -0700 Subject: [PATCH 7/8] Rationalize embedder.dart and shell.dart This patch combines embedder.dart and shell.dart into one thing. We should now handle a bunch of error cases better. * embedder.connectToApplication has moved to shell.connectToApplication, matching the rest of the mojo universe. * embedder.connecttoService has moved to shell.connnectToService (and merged with shell.requestService). * shell.requestService is now shell.connectToService, matching the rest of the mojo universe. * serviceRegistry has moved from embedder.serviceRegistry to a top-level getter. Fixes #1803 --- engine/src/flutter/sky/packages/updater/lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/flutter/sky/packages/updater/lib/main.dart b/engine/src/flutter/sky/packages/updater/lib/main.dart index 9f2e2a740e..d95c5523ab 100644 --- a/engine/src/flutter/sky/packages/updater/lib/main.dart +++ b/engine/src/flutter/sky/packages/updater/lib/main.dart @@ -23,7 +23,7 @@ const String kBundleFile = 'app.flx'; UpdateServiceProxy _initUpdateService() { UpdateServiceProxy updateService = new UpdateServiceProxy.unbound(); - shell.requestService(null, updateService); + shell.connectToService(null, updateService); return updateService; } From 03b9483b5f3c249cbc7bc336df88729abdc3d782 Mon Sep 17 00:00:00 2001 From: Hixie Date: Thu, 29 Oct 2015 14:41:56 -0700 Subject: [PATCH 8/8] Rev package versions for release. sky_engine is now at 0.0.45 sky_services is now at 0.0.45 flx is now at 0.0.4 flutter is now at 0.0.15 flutter_sprites is now at 0.0.12 --- engine/src/flutter/examples/address_book/pubspec.yaml | 2 +- engine/src/flutter/examples/hello_world/pubspec.yaml | 2 +- engine/src/flutter/examples/mine_digger/pubspec.yaml | 2 +- engine/src/flutter/sky/packages/flx/pubspec.yaml | 4 ++-- engine/src/flutter/sky/packages/sky_engine/pubspec.yaml | 2 +- engine/src/flutter/sky/packages/sky_services/pubspec.yaml | 2 +- engine/src/flutter/sky/packages/updater/pubspec.yaml | 4 ++-- engine/src/flutter/sky/packages/workbench/pubspec.yaml | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/engine/src/flutter/examples/address_book/pubspec.yaml b/engine/src/flutter/examples/address_book/pubspec.yaml index 22ac0489c7..2f46a62f84 100644 --- a/engine/src/flutter/examples/address_book/pubspec.yaml +++ b/engine/src/flutter/examples/address_book/pubspec.yaml @@ -1,7 +1,7 @@ name: address_book dependencies: flutter: - '0.0.14' + '0.0.15' sky_tools: any dependency_overrides: material_design_icons: diff --git a/engine/src/flutter/examples/hello_world/pubspec.yaml b/engine/src/flutter/examples/hello_world/pubspec.yaml index b93e699fd4..1c3b0d3f8d 100644 --- a/engine/src/flutter/examples/hello_world/pubspec.yaml +++ b/engine/src/flutter/examples/hello_world/pubspec.yaml @@ -1,7 +1,7 @@ name: hello_world dependencies: flutter: - '0.0.14' + '0.0.15' sky_tools: any dependency_overrides: material_design_icons: diff --git a/engine/src/flutter/examples/mine_digger/pubspec.yaml b/engine/src/flutter/examples/mine_digger/pubspec.yaml index 2b35c303ff..5d1e48c876 100644 --- a/engine/src/flutter/examples/mine_digger/pubspec.yaml +++ b/engine/src/flutter/examples/mine_digger/pubspec.yaml @@ -1,7 +1,7 @@ name: mine_digger dependencies: flutter: - '0.0.14' + '0.0.15' sky_tools: any dependency_overrides: material_design_icons: diff --git a/engine/src/flutter/sky/packages/flx/pubspec.yaml b/engine/src/flutter/sky/packages/flx/pubspec.yaml index 1fd13d604c..f0ca06cde6 100644 --- a/engine/src/flutter/sky/packages/flx/pubspec.yaml +++ b/engine/src/flutter/sky/packages/flx/pubspec.yaml @@ -1,11 +1,11 @@ name: flx -version: 0.0.3 +version: 0.0.4 author: Flutter Authors description: Library for dealing with Flutter bundle (.flx) files homepage: http://flutter.io dependencies: sky_services: - '0.0.44' + '0.0.45' yaml: ^2.1.3 asn1lib: ^0.4.1 cipher: ^0.7.1 diff --git a/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml b/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml index f773e9fb0f..aa878a722f 100644 --- a/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml +++ b/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml @@ -1,5 +1,5 @@ name: sky_engine -version: 0.0.44 +version: 0.0.45 author: Flutter Authors description: Dart SDK extensions for dart:ui homepage: http://flutter.io diff --git a/engine/src/flutter/sky/packages/sky_services/pubspec.yaml b/engine/src/flutter/sky/packages/sky_services/pubspec.yaml index b7c2cac36a..1d1e224fe1 100644 --- a/engine/src/flutter/sky/packages/sky_services/pubspec.yaml +++ b/engine/src/flutter/sky/packages/sky_services/pubspec.yaml @@ -1,5 +1,5 @@ name: sky_services -version: 0.0.44 +version: 0.0.45 author: Flutter Authors description: Mojom interfaces associated with Flutter homepage: http://flutter.io diff --git a/engine/src/flutter/sky/packages/updater/pubspec.yaml b/engine/src/flutter/sky/packages/updater/pubspec.yaml index 4ac63702f1..e0e28d94f2 100644 --- a/engine/src/flutter/sky/packages/updater/pubspec.yaml +++ b/engine/src/flutter/sky/packages/updater/pubspec.yaml @@ -5,13 +5,13 @@ homepage: http://flutter.io dependencies: mojo: 0.3.0 flutter: - '0.0.14' + '0.0.15' sky_services: ^0.0.40 yaml: ^2.1.3 path: ^1.3.0 flx: 0.0.1 flutter_sprites: - '0.0.11' + '0.0.12' dependency_overrides: flutter: path: ../sky diff --git a/engine/src/flutter/sky/packages/workbench/pubspec.yaml b/engine/src/flutter/sky/packages/workbench/pubspec.yaml index 0971ac9131..f41f03912e 100644 --- a/engine/src/flutter/sky/packages/workbench/pubspec.yaml +++ b/engine/src/flutter/sky/packages/workbench/pubspec.yaml @@ -5,18 +5,18 @@ description: A workspace to host pub packages homepage: https://github.com/flutter/engine/tree/master/sky/packages/workbench dependencies: flutter: - '0.0.14' + '0.0.15' sky_tools: any cipher: any asn1lib: any flutter_rendering_examples: any flutter_sprites: - '0.0.11' + '0.0.12' playfair: any flx: - '0.0.3' + '0.0.4' sky_services: - '0.0.44' + '0.0.45' dependency_overrides: material_design_icons: path: ../material_design_icons