From 44c1cbfef81456db9b05bb5b0c8f4b83b4276d5d Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 12:27:57 -0700 Subject: [PATCH 01/12] Update mojo and mojo_services dependencies --- sky/packages/sky/pubspec.yaml | 5 ++--- sky/packages/sky_services/pubspec.yaml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sky/packages/sky/pubspec.yaml b/sky/packages/sky/pubspec.yaml index 5ceab1e5f7d..ae883b24fd8 100644 --- a/sky/packages/sky/pubspec.yaml +++ b/sky/packages/sky/pubspec.yaml @@ -6,9 +6,8 @@ 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 diff --git a/sky/packages/sky_services/pubspec.yaml b/sky/packages/sky_services/pubspec.yaml index a2cc52cc92b..e3c60b286c6 100644 --- a/sky/packages/sky_services/pubspec.yaml +++ b/sky/packages/sky_services/pubspec.yaml @@ -4,7 +4,6 @@ author: Chromium Authors 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' From f3eaa209206417055ef88ad1ed34bd1c6b693b7c Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:25:26 -0700 Subject: [PATCH 02/12] Add DartPackage annotation --- sky/services/activity/activity.mojom | 1 + sky/services/engine/input_event.mojom | 1 + sky/services/media/media.mojom | 1 + sky/services/testing/test_harness.mojom | 1 + sky/services/vsync/vsync.mojom | 1 + 5 files changed, 5 insertions(+) diff --git a/sky/services/activity/activity.mojom b/sky/services/activity/activity.mojom index 440176d5369..be4a7e08371 100644 --- a/sky/services/activity/activity.mojom +++ b/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 { diff --git a/sky/services/engine/input_event.mojom b/sky/services/engine/input_event.mojom index eb7c4d1ae8e..2784a6a9f83 100644 --- a/sky/services/engine/input_event.mojom +++ b/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 { diff --git a/sky/services/media/media.mojom b/sky/services/media/media.mojom index ab6edcb48b5..55e64ff7a30 100644 --- a/sky/services/media/media.mojom +++ b/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 { diff --git a/sky/services/testing/test_harness.mojom b/sky/services/testing/test_harness.mojom index 0b735b8ec60..66bc5e62aed 100644 --- a/sky/services/testing/test_harness.mojom +++ b/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"; diff --git a/sky/services/vsync/vsync.mojom b/sky/services/vsync/vsync.mojom index 715b9067994..46769ab6f39 100644 --- a/sky/services/vsync/vsync.mojom +++ b/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 { From 5397a2e5aa4aaef0b07f5454e9c7e874724997d0 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:57:20 -0700 Subject: [PATCH 03/12] Neuter sky:init --- sky/packages/sky/bin/init.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/sky/packages/sky/bin/init.dart b/sky/packages/sky/bin/init.dart index 85ec831d6e1..58021b113cf 100644 --- a/sky/packages/sky/bin/init.dart +++ b/sky/packages/sky/bin/init.dart @@ -10,7 +10,4 @@ import 'dart:io'; main(List arguments) { - ProcessResult result = Process.runSync(Platform.executable, ['-p', 'packages', 'packages/mojom/generate.dart']); - stdout.write(result.stdout); - stderr.write(result.stderr); } From 0c2d0f52f004c1e98dcb83eb6b21218e2cd97047 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:57:57 -0700 Subject: [PATCH 04/12] Use built sky_services in workbench --- sky/packages/workbench/pubspec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sky/packages/workbench/pubspec.yaml b/sky/packages/workbench/pubspec.yaml index 71cf74913b0..81d282944f5 100644 --- a/sky/packages/workbench/pubspec.yaml +++ b/sky/packages/workbench/pubspec.yaml @@ -11,5 +11,7 @@ dependency_overrides: path: ../material_design_icons sky: path: ../sky + sky_services: + path: ../../../out/Debug/gen/dart-pkg/sky_services environment: sdk: '>=1.8.0 <2.0.0' From 3346808587df1314308f0e190aebdea78600a7ef Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:58:27 -0700 Subject: [PATCH 05/12] Fix imports --- sky/packages/sky/example/widgets/piano.dart | 4 ++-- sky/packages/sky/lib/editing/editable_string.dart | 2 +- sky/packages/sky/lib/mojo/activity.dart | 4 ++-- sky/packages/sky/lib/mojo/asset_bundle.dart | 2 +- sky/packages/sky/lib/mojo/embedder.dart | 14 +++++++------- sky/packages/sky/lib/mojo/keyboard.dart | 2 +- sky/packages/sky/lib/mojo/net/fetch.dart | 8 ++++---- sky/packages/sky/lib/mojo/net/image_cache.dart | 2 +- sky/packages/sky/lib/mojo/shell.dart | 2 +- sky/tests/resources/harness.dart | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sky/packages/sky/example/widgets/piano.dart b/sky/packages/sky/example/widgets/piano.dart index 23737e210b2..658d63527e5 100644 --- a/sky/packages/sky/example/widgets/piano.dart +++ b/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"; diff --git a/sky/packages/sky/lib/editing/editable_string.dart b/sky/packages/sky/lib/editing/editable_string.dart index 728788ec52d..e9331b4cce0 100644 --- a/sky/packages/sky/lib/editing/editable_string.dart +++ b/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(); diff --git a/sky/packages/sky/lib/mojo/activity.dart b/sky/packages/sky/lib/mojo/activity.dart index 3cb231b9daf..bfa5b66d319 100644 --- a/sky/packages/sky/lib/mojo/activity.dart +++ b/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; diff --git a/sky/packages/sky/lib/mojo/asset_bundle.dart b/sky/packages/sky/lib/mojo/asset_bundle.dart index 6845a8f44f5..056eb8b1a2c 100644 --- a/sky/packages/sky/lib/mojo/asset_bundle.dart +++ b/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; diff --git a/sky/packages/sky/lib/mojo/embedder.dart b/sky/packages/sky/lib/mojo/embedder.dart index 1bcf13ba231..1d61267c5ec 100644 --- a/sky/packages/sky/lib/mojo/embedder.dart +++ b/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(); diff --git a/sky/packages/sky/lib/mojo/keyboard.dart b/sky/packages/sky/lib/mojo/keyboard.dart index 3b640223673..8b5f4ccf5fb 100644 --- a/sky/packages/sky/lib/mojo/keyboard.dart +++ b/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 { diff --git a/sky/packages/sky/lib/mojo/net/fetch.dart b/sky/packages/sky/lib/mojo/net/fetch.dart index 2ee166d1ca3..56a3b222382 100644 --- a/sky/packages/sky/lib/mojo/net/fetch.dart +++ b/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() { diff --git a/sky/packages/sky/lib/mojo/net/image_cache.dart b/sky/packages/sky/lib/mojo/net/image_cache.dart index 4ab394176b1..56723b6ad6f 100644 --- a/sky/packages/sky/lib/mojo/net/image_cache.dart +++ b/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> _cache = diff --git a/sky/packages/sky/lib/mojo/shell.dart b/sky/packages/sky/lib/mojo/shell.dart index ddd15028497..916c162ad77 100644 --- a/sky/packages/sky/lib/mojo/shell.dart +++ b/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() { diff --git a/sky/tests/resources/harness.dart b/sky/tests/resources/harness.dart index 7ea476d9bb8..56da4834d83 100644 --- a/sky/tests/resources/harness.dart +++ b/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(); From b2e19f10104ce9d3bd62206d414409ae0ec41b9d Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 14:18:30 -0700 Subject: [PATCH 06/12] Bump sky_services to v0.0.3 --- sky/packages/sky/pubspec.yaml | 2 +- sky/packages/sky_services/pubspec.yaml | 4 ++-- sky/packages/workbench/pubspec.yaml | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sky/packages/sky/pubspec.yaml b/sky/packages/sky/pubspec.yaml index ae883b24fd8..9ec03bbb071 100644 --- a/sky/packages/sky/pubspec.yaml +++ b/sky/packages/sky/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: 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: diff --git a/sky/packages/sky_services/pubspec.yaml b/sky/packages/sky_services/pubspec.yaml index e3c60b286c6..1a4d0b3fe1f 100644 --- a/sky/packages/sky_services/pubspec.yaml +++ b/sky/packages/sky_services/pubspec.yaml @@ -1,9 +1,9 @@ name: sky_services -version: 0.0.2 +version: 0.0.3 author: Chromium Authors description: Mojom interfaces associated with Sky homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky_services dependencies: - mojo: 0.0.21 + mojo: ^0.0.21 environment: sdk: '>=1.8.0 <2.0.0' diff --git a/sky/packages/workbench/pubspec.yaml b/sky/packages/workbench/pubspec.yaml index 81d282944f5..71cf74913b0 100644 --- a/sky/packages/workbench/pubspec.yaml +++ b/sky/packages/workbench/pubspec.yaml @@ -11,7 +11,5 @@ dependency_overrides: path: ../material_design_icons sky: path: ../sky - sky_services: - path: ../../../out/Debug/gen/dart-pkg/sky_services environment: sdk: '>=1.8.0 <2.0.0' From f5bb1bf86b92b1e8b0f7a720fd9ea129144ae148 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 12:27:57 -0700 Subject: [PATCH 07/12] Update mojo and mojo_services dependencies --- sky/packages/sky/pubspec.yaml | 5 ++--- sky/packages/sky_services/pubspec.yaml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sky/packages/sky/pubspec.yaml b/sky/packages/sky/pubspec.yaml index 5ceab1e5f7d..ae883b24fd8 100644 --- a/sky/packages/sky/pubspec.yaml +++ b/sky/packages/sky/pubspec.yaml @@ -6,9 +6,8 @@ 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 diff --git a/sky/packages/sky_services/pubspec.yaml b/sky/packages/sky_services/pubspec.yaml index a2cc52cc92b..e3c60b286c6 100644 --- a/sky/packages/sky_services/pubspec.yaml +++ b/sky/packages/sky_services/pubspec.yaml @@ -4,7 +4,6 @@ author: Chromium Authors 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' From 44c883a340a0a7b2f0f5689374eda0ea90cbadb1 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:25:26 -0700 Subject: [PATCH 08/12] Add DartPackage annotation --- sky/services/activity/activity.mojom | 1 + sky/services/engine/input_event.mojom | 1 + sky/services/media/media.mojom | 1 + sky/services/testing/test_harness.mojom | 1 + sky/services/vsync/vsync.mojom | 1 + 5 files changed, 5 insertions(+) diff --git a/sky/services/activity/activity.mojom b/sky/services/activity/activity.mojom index 440176d5369..be4a7e08371 100644 --- a/sky/services/activity/activity.mojom +++ b/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 { diff --git a/sky/services/engine/input_event.mojom b/sky/services/engine/input_event.mojom index eb7c4d1ae8e..2784a6a9f83 100644 --- a/sky/services/engine/input_event.mojom +++ b/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 { diff --git a/sky/services/media/media.mojom b/sky/services/media/media.mojom index ab6edcb48b5..55e64ff7a30 100644 --- a/sky/services/media/media.mojom +++ b/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 { diff --git a/sky/services/testing/test_harness.mojom b/sky/services/testing/test_harness.mojom index 0b735b8ec60..66bc5e62aed 100644 --- a/sky/services/testing/test_harness.mojom +++ b/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"; diff --git a/sky/services/vsync/vsync.mojom b/sky/services/vsync/vsync.mojom index 715b9067994..46769ab6f39 100644 --- a/sky/services/vsync/vsync.mojom +++ b/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 { From 95aace8b7032081126e1715ddcc53196486de8a1 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:57:20 -0700 Subject: [PATCH 09/12] Neuter sky:init --- sky/packages/sky/bin/init.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/sky/packages/sky/bin/init.dart b/sky/packages/sky/bin/init.dart index 85ec831d6e1..58021b113cf 100644 --- a/sky/packages/sky/bin/init.dart +++ b/sky/packages/sky/bin/init.dart @@ -10,7 +10,4 @@ import 'dart:io'; main(List arguments) { - ProcessResult result = Process.runSync(Platform.executable, ['-p', 'packages', 'packages/mojom/generate.dart']); - stdout.write(result.stdout); - stderr.write(result.stderr); } From c5a793352e575a93dad1e7982d51ead2057bc54d Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:57:57 -0700 Subject: [PATCH 10/12] Use built sky_services in workbench --- sky/packages/workbench/pubspec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sky/packages/workbench/pubspec.yaml b/sky/packages/workbench/pubspec.yaml index 71cf74913b0..81d282944f5 100644 --- a/sky/packages/workbench/pubspec.yaml +++ b/sky/packages/workbench/pubspec.yaml @@ -11,5 +11,7 @@ dependency_overrides: path: ../material_design_icons sky: path: ../sky + sky_services: + path: ../../../out/Debug/gen/dart-pkg/sky_services environment: sdk: '>=1.8.0 <2.0.0' From c935a663a97d66f72c11b629489c870b949439d6 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 13:58:27 -0700 Subject: [PATCH 11/12] Fix imports --- sky/packages/sky/example/widgets/piano.dart | 4 ++-- sky/packages/sky/lib/editing/editable_string.dart | 2 +- sky/packages/sky/lib/mojo/activity.dart | 4 ++-- sky/packages/sky/lib/mojo/asset_bundle.dart | 2 +- sky/packages/sky/lib/mojo/embedder.dart | 14 +++++++------- sky/packages/sky/lib/mojo/keyboard.dart | 2 +- sky/packages/sky/lib/mojo/net/fetch.dart | 8 ++++---- sky/packages/sky/lib/mojo/net/image_cache.dart | 2 +- sky/packages/sky/lib/mojo/shell.dart | 2 +- sky/tests/resources/harness.dart | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sky/packages/sky/example/widgets/piano.dart b/sky/packages/sky/example/widgets/piano.dart index 23737e210b2..658d63527e5 100644 --- a/sky/packages/sky/example/widgets/piano.dart +++ b/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"; diff --git a/sky/packages/sky/lib/editing/editable_string.dart b/sky/packages/sky/lib/editing/editable_string.dart index 728788ec52d..e9331b4cce0 100644 --- a/sky/packages/sky/lib/editing/editable_string.dart +++ b/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(); diff --git a/sky/packages/sky/lib/mojo/activity.dart b/sky/packages/sky/lib/mojo/activity.dart index 3cb231b9daf..bfa5b66d319 100644 --- a/sky/packages/sky/lib/mojo/activity.dart +++ b/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; diff --git a/sky/packages/sky/lib/mojo/asset_bundle.dart b/sky/packages/sky/lib/mojo/asset_bundle.dart index 6845a8f44f5..056eb8b1a2c 100644 --- a/sky/packages/sky/lib/mojo/asset_bundle.dart +++ b/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; diff --git a/sky/packages/sky/lib/mojo/embedder.dart b/sky/packages/sky/lib/mojo/embedder.dart index 1bcf13ba231..1d61267c5ec 100644 --- a/sky/packages/sky/lib/mojo/embedder.dart +++ b/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(); diff --git a/sky/packages/sky/lib/mojo/keyboard.dart b/sky/packages/sky/lib/mojo/keyboard.dart index 3b640223673..8b5f4ccf5fb 100644 --- a/sky/packages/sky/lib/mojo/keyboard.dart +++ b/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 { diff --git a/sky/packages/sky/lib/mojo/net/fetch.dart b/sky/packages/sky/lib/mojo/net/fetch.dart index 2ee166d1ca3..56a3b222382 100644 --- a/sky/packages/sky/lib/mojo/net/fetch.dart +++ b/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() { diff --git a/sky/packages/sky/lib/mojo/net/image_cache.dart b/sky/packages/sky/lib/mojo/net/image_cache.dart index 4ab394176b1..56723b6ad6f 100644 --- a/sky/packages/sky/lib/mojo/net/image_cache.dart +++ b/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> _cache = diff --git a/sky/packages/sky/lib/mojo/shell.dart b/sky/packages/sky/lib/mojo/shell.dart index ddd15028497..916c162ad77 100644 --- a/sky/packages/sky/lib/mojo/shell.dart +++ b/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() { diff --git a/sky/tests/resources/harness.dart b/sky/tests/resources/harness.dart index 7ea476d9bb8..56da4834d83 100644 --- a/sky/tests/resources/harness.dart +++ b/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(); From 596e6053bd31ac1df704d0e5ba19b8a8659b87fd Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 30 Jul 2015 14:18:30 -0700 Subject: [PATCH 12/12] Bump sky_services to v0.0.3 --- sky/packages/sky/pubspec.yaml | 2 +- sky/packages/sky_services/pubspec.yaml | 4 ++-- sky/packages/workbench/pubspec.yaml | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sky/packages/sky/pubspec.yaml b/sky/packages/sky/pubspec.yaml index ae883b24fd8..9ec03bbb071 100644 --- a/sky/packages/sky/pubspec.yaml +++ b/sky/packages/sky/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: 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: diff --git a/sky/packages/sky_services/pubspec.yaml b/sky/packages/sky_services/pubspec.yaml index e3c60b286c6..1a4d0b3fe1f 100644 --- a/sky/packages/sky_services/pubspec.yaml +++ b/sky/packages/sky_services/pubspec.yaml @@ -1,9 +1,9 @@ name: sky_services -version: 0.0.2 +version: 0.0.3 author: Chromium Authors description: Mojom interfaces associated with Sky homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky_services dependencies: - mojo: 0.0.21 + mojo: ^0.0.21 environment: sdk: '>=1.8.0 <2.0.0' diff --git a/sky/packages/workbench/pubspec.yaml b/sky/packages/workbench/pubspec.yaml index 81d282944f5..71cf74913b0 100644 --- a/sky/packages/workbench/pubspec.yaml +++ b/sky/packages/workbench/pubspec.yaml @@ -11,7 +11,5 @@ dependency_overrides: path: ../material_design_icons sky: path: ../sky - sky_services: - path: ../../../out/Debug/gen/dart-pkg/sky_services environment: sdk: '>=1.8.0 <2.0.0'