Merge pull request #388 from johnmccutchan/sky_services

Add DartPackage annotation for all sky_services

sky/packages/sky/bin/init.dart

@@ -10,7 +10,4 @@
 import 'dart:io';
 
 main(List<String> arguments) {
-  ProcessResult result = Process.runSync(Platform.executable, ['-p', 'packages', 'packages/mojom/generate.dart']);
-  stdout.write(result.stdout);
-  stderr.write(result.stderr);
 }

sky/packages/sky/example/widgets/piano.dart

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:mojom/media/media.mojom.dart';
-import 'package:mojom/mojo/url_response.mojom.dart';
+import 'package:mojo/mojo/url_response.mojom.dart';
 import 'package:sky/mojo/net/fetch.dart';
 import 'package:sky/mojo/shell.dart' as shell;
 import 'package:sky/rendering/box.dart';
 import 'package:sky/rendering/flex.dart';
 import 'package:sky/theme/colors.dart' as colors;
 import 'package:sky/widgets/basic.dart';
+import 'package:sky_services/media/media.mojom.dart';
 
 // All of these sounds are marked as public domain at soundbible.
 const String chimes = "http://soundbible.com/grab.php?id=2030&type=wav";

sky/packages/sky/lib/editing/editable_string.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:mojom/keyboard/keyboard.mojom.dart';
+import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 
 typedef void StringUpdated();
 

sky/packages/sky/lib/mojo/activity.dart

@@ -4,10 +4,10 @@
 
 import 'dart:sky';
 
-import 'package:mojom/activity/activity.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
+import 'package:sky_services/activity/activity.mojom.dart';
 
-export 'package:mojom/activity/activity.mojom.dart' show Intent, ComponentName, StringExtra;
+export 'package:sky_services/activity/activity.mojom.dart' show Intent, ComponentName, StringExtra;
 
 const int NEW_DOCUMENT = 0x00080000;
 const int NEW_TASK = 0x10000000;

sky/packages/sky/lib/mojo/asset_bundle.dart

@@ -8,7 +8,7 @@ import 'dart:sky.internals' as internals;
 import 'dart:typed_data';
 
 import 'package:mojo/core.dart' as core;
-import 'package:mojom/mojo/asset_bundle/asset_bundle.mojom.dart';
+import 'package:mojo_services/mojo/asset_bundle/asset_bundle.mojom.dart';
 import 'package:sky/mojo/net/fetch.dart';
 import 'package:sky/mojo/net/image_cache.dart' as image_cache;
 import 'package:sky/mojo/shell.dart' as shell;

sky/packages/sky/lib/mojo/embedder.dart

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import "dart:sky.internals" as internals;
+import 'dart:sky.internals' as internals;
 
-import "package:mojo/application.dart";
-import "package:mojo/bindings.dart" as bindings;
-import "package:mojo/core.dart" as core;
-import "package:mojom/mojo/service_provider.mojom.dart";
-import "package:mojom/mojo/service_registry.mojom.dart";
-import "package:mojom/mojo/shell.mojom.dart";
+import 'package:mojo/application.dart';
+import 'package:mojo/bindings.dart' as bindings;
+import 'package:mojo/core.dart' as core;
+import 'package:mojo/mojo/service_provider.mojom.dart';
+import 'package:mojo/mojo/shell.mojom.dart';
+import 'package:mojo_services/mojo/service_registry.mojom.dart';
 
 final _EmbedderImpl embedder = new _EmbedderImpl();
 

sky/packages/sky/lib/mojo/keyboard.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:mojom/keyboard/keyboard.mojom.dart';
+import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
 
 class _KeyboardConnection {

sky/packages/sky/lib/mojo/net/fetch.dart

@@ -6,10 +6,10 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:mojo/core.dart' as core;
-import 'package:mojom/mojo/network_service.mojom.dart';
-import 'package:mojom/mojo/url_loader.mojom.dart';
-import 'package:mojom/mojo/url_request.mojom.dart';
-import 'package:mojom/mojo/url_response.mojom.dart';
+import 'package:mojo/mojo/url_request.mojom.dart';
+import 'package:mojo/mojo/url_response.mojom.dart';
+import 'package:mojo_services/mojo/network_service.mojom.dart';
+import 'package:mojo_services/mojo/url_loader.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
 
 NetworkServiceProxy _initNetworkService() {

sky/packages/sky/lib/mojo/net/image_cache.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:sky' as sky;
 
-import 'package:mojom/mojo/url_response.mojom.dart';
+import 'package:mojo/mojo/url_response.mojom.dart';
 import 'package:sky/mojo/net/fetch.dart';
 
 final HashMap<String, Future<sky.Image>> _cache =

sky/packages/sky/lib/mojo/shell.dart

@@ -6,7 +6,7 @@ import 'dart:sky.internals' as internals;
 
 import 'package:mojo/application.dart';
 import 'package:mojo/core.dart' as core;
-import 'package:mojom/mojo/service_provider.mojom.dart';
+import 'package:mojo/mojo/service_provider.mojom.dart';
 import 'package:sky/mojo/embedder.dart';
 
 ApplicationConnection _initConnection() {

sky/packages/sky/pubspec.yaml

@@ -6,12 +6,11 @@ homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky
 dependencies:
   cassowary: ^0.1.7
   material_design_icons: ^0.0.2
-  mojo_services: 0.0.20
-  mojo: 0.0.20
-  mojom: 0.0.20
+  mojo_services: 0.0.21
+  mojo: 0.0.21
   newton: ^0.1.2
   sky_engine: ^0.0.2
-  sky_services: ^0.0.2
+  sky_services: ^0.0.3
   sky_tools: ^0.0.4
   vector_math: ^1.4.3
 environment:

sky/packages/sky_services/pubspec.yaml

@@ -1,10 +1,9 @@
 name: sky_services
-version: 0.0.2
+version: 0.0.3
 author: Chromium Authors <sky-dev@googlegroups.com>
 description: Mojom interfaces associated with Sky
 homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky_services
 dependencies:
-  mojo: 0.0.20
-  mojom: 0.0.20
+  mojo: ^0.0.21
 environment:
   sdk: '>=1.8.0 <2.0.0'

sky/services/activity/activity.mojom

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+[DartPackage="sky_services"]
 module activity;
 
 struct StringExtra {

sky/services/engine/input_event.mojom

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+[DartPackage="sky_services"]
 module sky;
 
 enum EventType {

sky/services/media/media.mojom

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+[DartPackage="sky_services"]
 module media;
 
 interface MediaPlayer {

sky/services/testing/test_harness.mojom

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+[DartPackage="sky_services"]
 module sky;
 
 import "mojo/services/input_events/public/interfaces/input_events.mojom";

sky/services/vsync/vsync.mojom

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+[DartPackage="sky_services"]
 module vsync;
 
 interface VSyncProvider {

sky/tests/resources/harness.dart

@@ -1,7 +1,7 @@
 import "dart:sky.internals" as internals;
 
 import 'package:sky/mojo/shell.dart' as shell;
-import 'package:mojom/sky/test_harness.mojom.dart';
+import 'package:sky_services/sky/test_harness.mojom.dart';
 
 void notifyTestComplete(String result) {
   TestHarnessProxy test_harness = new TestHarnessProxy.unbound();