From 65eba90843b52658fc36fcbd9920d1cfb7dcc7b7 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 9 Oct 2015 20:44:52 -0700 Subject: [PATCH] Rename package:sky to package:flutter --- examples/address_book/lib/main.dart | 2 +- examples/address_book/pubspec.yaml | 4 ++-- examples/demo_launcher/lib/main.dart | 6 +++--- examples/demo_launcher/pubspec.yaml | 4 ++-- examples/fitness/lib/main.dart | 4 ++-- examples/fitness/lib/user_data.dart | 2 +- examples/fitness/pubspec.yaml | 4 ++-- examples/game/example_effect_line.dart | 8 ++++---- examples/game/lib/game_demo.dart | 2 +- examples/game/lib/main.dart | 8 ++++---- examples/game/pubspec.yaml | 4 ++-- examples/game/test_bed.dart | 8 ++++---- examples/game/test_drawatlas.dart | 8 ++++---- examples/game/test_performance.dart | 8 ++++---- examples/game/test_physics.dart | 8 ++++---- examples/hello_world/lib/main.dart | 2 +- examples/hello_world/pubspec.yaml | 4 ++-- examples/mine_digger/lib/main.dart | 8 ++++---- examples/mine_digger/pubspec.yaml | 4 ++-- examples/raw/pubspec.yaml | 4 ++-- examples/raw/spinning_image.dart | 2 +- examples/rendering/align_items.dart | 2 +- examples/rendering/baseline.dart | 2 +- examples/rendering/borders.dart | 2 +- examples/rendering/flex.dart | 2 +- examples/rendering/interactive_flex.dart | 4 ++-- examples/rendering/justify_content.dart | 2 +- examples/rendering/pubspec.yaml | 4 ++-- examples/rendering/render_grid.dart | 4 ++-- examples/rendering/render_paragraph.dart | 2 +- examples/rendering/sector_layout.dart | 2 +- examples/rendering/shadowed_box.dart | 4 ++-- examples/rendering/simple_autolayout.dart | 2 +- examples/rendering/solid_color_box.dart | 2 +- examples/rendering/spinning_flex.dart | 4 ++-- examples/rendering/touch_demo.dart | 4 ++-- examples/rendering/transform.dart | 2 +- examples/stocks/lib/main.dart | 6 +++--- examples/stocks/lib/stock_data.dart | 2 +- examples/stocks/pubspec.yaml | 4 ++-- examples/widgets/big_switch.dart | 2 +- examples/widgets/card_collection.dart | 4 ++-- examples/widgets/container.dart | 2 +- examples/widgets/date_picker.dart | 2 +- examples/widgets/drag_and_drop.dart | 6 +++--- examples/widgets/ensure_visible.dart | 2 +- examples/widgets/horizontal_scrolling.dart | 2 +- examples/widgets/indexed_stack.dart | 4 ++-- examples/widgets/navigation.dart | 2 +- examples/widgets/overlay_geometry.dart | 4 ++-- examples/widgets/pageable_list.dart | 4 ++-- examples/widgets/piano.dart | 6 +++--- examples/widgets/progress_indicator.dart | 4 ++-- examples/widgets/pubspec.yaml | 4 ++-- examples/widgets/scale.dart | 4 ++-- examples/widgets/sector.dart | 4 ++-- examples/widgets/spinning_mixed.dart | 6 +++--- examples/widgets/styled_text.dart | 4 ++-- examples/widgets/tabs.dart | 4 ++-- packages/flutter/lib/src/material/card.dart | 2 +- packages/flutter/lib/src/material/checkbox.dart | 6 +++--- packages/flutter/lib/src/material/date_picker.dart | 6 +++--- packages/flutter/lib/src/material/dialog.dart | 6 +++--- packages/flutter/lib/src/material/drawer.dart | 4 ++-- .../flutter/lib/src/material/drawer_divider.dart | 2 +- packages/flutter/lib/src/material/drawer_header.dart | 2 +- packages/flutter/lib/src/material/drawer_item.dart | 6 +++--- packages/flutter/lib/src/material/flat_button.dart | 4 ++-- .../lib/src/material/floating_action_button.dart | 4 ++-- packages/flutter/lib/src/material/icon.dart | 4 ++-- packages/flutter/lib/src/material/icon_button.dart | 4 ++-- packages/flutter/lib/src/material/ink_well.dart | 8 ++++---- packages/flutter/lib/src/material/input.dart | 12 ++++++------ packages/flutter/lib/src/material/material.dart | 6 +++--- packages/flutter/lib/src/material/material_app.dart | 6 +++--- .../flutter/lib/src/material/material_button.dart | 4 ++-- packages/flutter/lib/src/material/popup_menu.dart | 6 +++--- .../flutter/lib/src/material/popup_menu_item.dart | 2 +- .../flutter/lib/src/material/progress_indicator.dart | 4 ++-- .../flutter/lib/src/material/radial_reaction.dart | 2 +- packages/flutter/lib/src/material/radio.dart | 2 +- packages/flutter/lib/src/material/raised_button.dart | 4 ++-- packages/flutter/lib/src/material/scaffold.dart | 4 ++-- packages/flutter/lib/src/material/shadows.dart | 2 +- packages/flutter/lib/src/material/snack_bar.dart | 8 ++++---- packages/flutter/lib/src/material/switch.dart | 8 ++++---- packages/flutter/lib/src/material/tabs.dart | 10 +++++----- packages/flutter/lib/src/material/theme.dart | 2 +- packages/flutter/lib/src/material/theme_data.dart | 4 ++-- packages/flutter/lib/src/material/title.dart | 4 ++-- packages/flutter/lib/src/material/tool_bar.dart | 4 ++-- packages/flutter/lib/src/material/typography.dart | 4 ++-- packages/flutter/lib/src/painting/box_painter.dart | 2 +- packages/flutter/lib/src/rendering/binding.dart | 4 ++-- packages/flutter/lib/src/rendering/box.dart | 4 ++-- .../lib/src/rendering/editable_paragraph.dart | 2 +- packages/flutter/lib/src/rendering/image.dart | 2 +- packages/flutter/lib/src/rendering/object.dart | 2 +- packages/flutter/lib/src/rendering/paragraph.dart | 4 ++-- packages/flutter/lib/src/rendering/proxy_box.dart | 4 ++-- packages/flutter/lib/src/rendering/shifted_box.dart | 2 +- packages/flutter/lib/src/rendering/toggleable.dart | 4 ++-- packages/flutter/lib/src/rendering/view.dart | 2 +- .../flutter/lib/src/widgets/animated_container.dart | 2 +- packages/flutter/lib/src/widgets/basic.dart | 6 +++--- packages/flutter/lib/src/widgets/binding.dart | 4 ++-- packages/flutter/lib/src/widgets/dismissable.dart | 2 +- packages/flutter/lib/src/widgets/drag_target.dart | 4 ++-- packages/flutter/lib/src/widgets/editable_text.dart | 4 ++-- packages/flutter/lib/src/widgets/framework.dart | 2 +- .../flutter/lib/src/widgets/gesture_detector.dart | 4 ++-- .../lib/src/widgets/homogeneous_viewport.dart | 6 +++--- packages/flutter/lib/src/widgets/mimic.dart | 2 +- packages/flutter/lib/src/widgets/mixed_viewport.dart | 2 +- packages/flutter/lib/src/widgets/navigator.dart | 2 +- packages/flutter/lib/src/widgets/scrollable.dart | 6 +++--- .../flutter/lib/src/widgets/statistics_overlay.dart | 2 +- packages/flutter/lib/src/widgets/transitions.dart | 4 ++-- packages/flutter/pubspec.yaml | 2 +- packages/flutter_sprites/lib/skysprites.dart | 10 +++++----- packages/flutter_sprites/pubspec.yaml | 4 ++-- packages/unit/pubspec.yaml | 4 ++-- packages/unit/test/animation/scheduler_test.dart | 2 +- packages/unit/test/gestures/arena_test.dart | 2 +- packages/unit/test/gestures/long_press_test.dart | 2 +- packages/unit/test/gestures/pointer_router_test.dart | 2 +- packages/unit/test/gestures/scale_test.dart | 2 +- packages/unit/test/gestures/scroll_test.dart | 2 +- packages/unit/test/gestures/show_press_test.dart | 2 +- packages/unit/test/gestures/tap_test.dart | 2 +- packages/unit/test/painting/edge_dims_test.dart | 2 +- packages/unit/test/rendering/box_test.dart | 4 ++-- packages/unit/test/rendering/flex_test.dart | 2 +- packages/unit/test/rendering/grid_test.dart | 2 +- packages/unit/test/rendering/image_test.dart | 2 +- .../unit/test/rendering/intrinsic_width_test.dart | 2 +- .../unit/test/rendering/positioned_box_test.dart | 2 +- packages/unit/test/rendering/rendering_tester.dart | 2 +- packages/unit/test/rendering/size_test.dart | 2 +- packages/unit/test/rendering/stack_test.dart | 2 +- packages/unit/test/rendering/viewport_test.dart | 2 +- packages/unit/test/services/mock_services.dart | 2 +- packages/unit/test/widget/align_test.dart | 2 +- .../unit/test/widget/animated_container_test.dart | 4 ++-- packages/unit/test/widget/block_test.dart | 2 +- packages/unit/test/widget/box_decoration_test.dart | 4 ++-- packages/unit/test/widget/build_scope_test.dart | 2 +- packages/unit/test/widget/center_test.dart | 2 +- packages/unit/test/widget/coordinates_test.dart | 4 ++-- packages/unit/test/widget/date_picker_test.dart | 2 +- packages/unit/test/widget/dismissable_test.dart | 4 ++-- packages/unit/test/widget/draggable_test.dart | 2 +- packages/unit/test/widget/drawer_test.dart | 4 ++-- packages/unit/test/widget/duplicate_key_test.dart | 2 +- packages/unit/test/widget/flex_test.dart | 2 +- packages/unit/test/widget/focus_test.dart | 2 +- .../test/widget/fractionally_sized_box_test.dart | 4 ++-- packages/unit/test/widget/gesture_detector_test.dart | 2 +- .../unit/test/widget/homogeneous_viewport_test.dart | 2 +- packages/unit/test/widget/input_test.dart | 6 +++--- packages/unit/test/widget/listener_test.dart | 2 +- packages/unit/test/widget/mixed_viewport_test.dart | 2 +- packages/unit/test/widget/multichild_test.dart | 4 ++-- packages/unit/test/widget/navigator_test.dart | 2 +- packages/unit/test/widget/pageable_list_test.dart | 2 +- packages/unit/test/widget/parent_data_test.dart | 4 ++-- .../unit/test/widget/progress_indicator_test.dart | 4 ++-- .../unit/test/widget/render_object_widget_test.dart | 4 ++-- packages/unit/test/widget/reparent_state_test.dart | 2 +- .../widget/scrollable_list_hit_testing_test.dart | 4 ++-- .../test/widget/scrollable_list_horizontal_test.dart | 4 ++-- .../test/widget/scrollable_list_vertical_test.dart | 2 +- packages/unit/test/widget/set_state_3_test.dart | 2 +- packages/unit/test/widget/set_state_test.dart | 2 +- packages/unit/test/widget/shader_mask_test.dart | 4 ++-- packages/unit/test/widget/size_observer_test.dart | 4 ++-- packages/unit/test/widget/snack_bar_test.dart | 2 +- packages/unit/test/widget/snap_scrolling_test.dart | 2 +- packages/unit/test/widget/stack_test.dart | 2 +- .../unit/test/widget/stateful_component_test.dart | 4 ++-- .../unit/test/widget/stateful_components_test.dart | 2 +- packages/unit/test/widget/syncing_test.dart | 2 +- packages/unit/test/widget/test_widgets.dart | 2 +- packages/unit/test/widget/transform_test.dart | 2 +- packages/unit/test/widget/widget_tester.dart | 6 +++--- packages/updater/lib/main.dart | 2 +- packages/updater/pubspec.yaml | 4 ++-- 187 files changed, 331 insertions(+), 331 deletions(-) diff --git a/examples/address_book/lib/main.dart b/examples/address_book/lib/main.dart index dee2b761489..964c39f2cfd 100644 --- a/examples/address_book/lib/main.dart +++ b/examples/address_book/lib/main.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:sky/material.dart'; +import 'package:flutter/material.dart'; class Field extends StatelessComponent { Field({ diff --git a/examples/address_book/pubspec.yaml b/examples/address_book/pubspec.yaml index ec6fdab5996..435112907b1 100644 --- a/examples/address_book/pubspec.yaml +++ b/examples/address_book/pubspec.yaml @@ -1,9 +1,9 @@ name: address_book dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/demo_launcher/lib/main.dart b/examples/demo_launcher/lib/main.dart index a95c24ee5c9..4d3be4e082b 100644 --- a/examples/demo_launcher/lib/main.dart +++ b/examples/demo_launcher/lib/main.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/services.dart'; AssetBundle _initBundle() { if (rootBundle != null) diff --git a/examples/demo_launcher/pubspec.yaml b/examples/demo_launcher/pubspec.yaml index 358724f84fe..637552c175f 100644 --- a/examples/demo_launcher/pubspec.yaml +++ b/examples/demo_launcher/pubspec.yaml @@ -1,9 +1,9 @@ name: demo_launcher dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/fitness/lib/main.dart b/examples/fitness/lib/main.dart index 453648ba5f7..a354c70313b 100644 --- a/examples/fitness/lib/main.dart +++ b/examples/fitness/lib/main.dart @@ -5,8 +5,8 @@ library fitness; import 'package:playfair/playfair.dart' as playfair; -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; import 'user_data.dart'; import 'date_utils.dart'; diff --git a/examples/fitness/lib/user_data.dart b/examples/fitness/lib/user_data.dart index 50c065ac4ef..ef6eabb1531 100644 --- a/examples/fitness/lib/user_data.dart +++ b/examples/fitness/lib/user_data.dart @@ -9,7 +9,7 @@ import 'dart:async'; import 'package:path/path.dart' as path; import 'main.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/services.dart'; String cachedDataFilePath = null; diff --git a/examples/fitness/pubspec.yaml b/examples/fitness/pubspec.yaml index f680cb0e0ee..2b8abd4804e 100644 --- a/examples/fitness/pubspec.yaml +++ b/examples/fitness/pubspec.yaml @@ -1,11 +1,11 @@ name: fitness dependencies: - sky: any + flutter: any sky_tools: any playfair: ^0.0.9 path: ^1.3.6 dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/game/example_effect_line.dart b/examples/game/example_effect_line.dart index 6d05848942a..d6a92af06fe 100644 --- a/examples/game/example_effect_line.dart +++ b/examples/game/example_effect_line.dart @@ -1,7 +1,7 @@ -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { diff --git a/examples/game/lib/game_demo.dart b/examples/game/lib/game_demo.dart index 652067bd44e..95862c79414 100644 --- a/examples/game/lib/game_demo.dart +++ b/examples/game/lib/game_demo.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:math' as math; import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:skysprites/skysprites.dart'; import 'package:vector_math/vector_math_64.dart'; diff --git a/examples/game/lib/main.dart b/examples/game/lib/main.dart index 098f3ebfbfe..54be5e7c7eb 100644 --- a/examples/game/lib/main.dart +++ b/examples/game/lib/main.dart @@ -4,10 +4,10 @@ import 'dart:async'; -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; import 'package:skysprites/skysprites.dart'; import 'game_demo.dart'; diff --git a/examples/game/pubspec.yaml b/examples/game/pubspec.yaml index 8f12e91948f..c7d1356b6dd 100644 --- a/examples/game/pubspec.yaml +++ b/examples/game/pubspec.yaml @@ -1,13 +1,13 @@ name: asteroids dependencies: - sky: any + flutter: any sky_tools: any skysprites: any box2d: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky skysprites: path: ../../skysprites diff --git a/examples/game/test_bed.dart b/examples/game/test_bed.dart index 5588ae8d07f..f63a8c6ca77 100644 --- a/examples/game/test_bed.dart +++ b/examples/game/test_bed.dart @@ -1,9 +1,9 @@ import 'dart:ui'; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { diff --git a/examples/game/test_drawatlas.dart b/examples/game/test_drawatlas.dart index 82422dd8a70..f49e36dc2c4 100644 --- a/examples/game/test_drawatlas.dart +++ b/examples/game/test_drawatlas.dart @@ -1,9 +1,9 @@ import 'dart:ui'; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { diff --git a/examples/game/test_performance.dart b/examples/game/test_performance.dart index 4bd42559876..2d570229765 100644 --- a/examples/game/test_performance.dart +++ b/examples/game/test_performance.dart @@ -1,10 +1,10 @@ import 'dart:ui' as sky; import 'dart:math' as math; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { diff --git a/examples/game/test_physics.dart b/examples/game/test_physics.dart index 4e8986e6dc8..a3915a40a89 100644 --- a/examples/game/test_physics.dart +++ b/examples/game/test_physics.dart @@ -1,9 +1,9 @@ import 'dart:ui'; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { diff --git a/examples/hello_world/lib/main.dart b/examples/hello_world/lib/main.dart index c3a23d1f76e..fc373381182 100644 --- a/examples/hello_world/lib/main.dart +++ b/examples/hello_world/lib/main.dart @@ -2,6 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; void main() => runApp(new Center(child: new Text('Hello, world!'))); diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml index 723d63b3d5c..6593305cb23 100644 --- a/examples/hello_world/pubspec.yaml +++ b/examples/hello_world/pubspec.yaml @@ -1,9 +1,9 @@ name: hello_world dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/mine_digger/lib/main.dart b/examples/mine_digger/lib/main.dart index 23cc79ff300..b17c6a9340a 100644 --- a/examples/mine_digger/lib/main.dart +++ b/examples/mine_digger/lib/main.dart @@ -4,10 +4,10 @@ import 'dart:ui' as sky; import 'dart:math'; -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; // Classic minesweeper-inspired game. The mouse controls are standard // except for left + right combo which is not implemented. For touch, diff --git a/examples/mine_digger/pubspec.yaml b/examples/mine_digger/pubspec.yaml index d941b44e6ff..739bf26ddd4 100644 --- a/examples/mine_digger/pubspec.yaml +++ b/examples/mine_digger/pubspec.yaml @@ -1,9 +1,9 @@ name: mine_digger dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/raw/pubspec.yaml b/examples/raw/pubspec.yaml index 1650deddd21..e4ac176448b 100644 --- a/examples/raw/pubspec.yaml +++ b/examples/raw/pubspec.yaml @@ -1,9 +1,9 @@ name: raw dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/raw/spinning_image.dart b/examples/raw/spinning_image.dart index 76e9c81155f..b9fe9b450be 100644 --- a/examples/raw/spinning_image.dart +++ b/examples/raw/spinning_image.dart @@ -6,7 +6,7 @@ import 'dart:math' as math; import 'dart:ui' as sky; import 'dart:typed_data'; -import 'package:sky/services.dart'; +import 'package:flutter/services.dart'; double timeBase = null; diff --git a/examples/rendering/align_items.dart b/examples/rendering/align_items.dart index 8cf517a2bc2..50b87f4b3e9 100644 --- a/examples/rendering/align_items.dart +++ b/examples/rendering/align_items.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:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; diff --git a/examples/rendering/baseline.dart b/examples/rendering/baseline.dart index 3488e23df83..a3838e7ecf5 100644 --- a/examples/rendering/baseline.dart +++ b/examples/rendering/baseline.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; RenderBox getBox(double lh) { RenderParagraph paragraph = new RenderParagraph( diff --git a/examples/rendering/borders.dart b/examples/rendering/borders.dart index 8a9df8d41f3..52b642e9490 100644 --- a/examples/rendering/borders.dart +++ b/examples/rendering/borders.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; void main() { var root = new RenderFlex( diff --git a/examples/rendering/flex.dart b/examples/rendering/flex.dart index a8b3a8b4cb9..2abaf26719a 100644 --- a/examples/rendering/flex.dart +++ b/examples/rendering/flex.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; RenderBox buildFlexExample() { diff --git a/examples/rendering/interactive_flex.dart b/examples/rendering/interactive_flex.dart index aee00745441..79134675ca1 100644 --- a/examples/rendering/interactive_flex.dart +++ b/examples/rendering/interactive_flex.dart @@ -5,8 +5,8 @@ import 'dart:ui' as sky; import 'dart:math' as math; -import 'package:sky/services.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; diff --git a/examples/rendering/justify_content.dart b/examples/rendering/justify_content.dart index 908bd4268c6..ffa6f48f53d 100644 --- a/examples/rendering/justify_content.dart +++ b/examples/rendering/justify_content.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:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; diff --git a/examples/rendering/pubspec.yaml b/examples/rendering/pubspec.yaml index 630a77e2fbc..72895ac0507 100644 --- a/examples/rendering/pubspec.yaml +++ b/examples/rendering/pubspec.yaml @@ -1,9 +1,9 @@ name: rendering dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/rendering/render_grid.dart b/examples/rendering/render_grid.dart index a2e31cf0c8f..111fe172dff 100644 --- a/examples/rendering/render_grid.dart +++ b/examples/rendering/render_grid.dart @@ -4,8 +4,8 @@ import 'dart:math' as math; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; diff --git a/examples/rendering/render_paragraph.dart b/examples/rendering/render_paragraph.dart index e4ab3b4b77d..83a9bb04138 100644 --- a/examples/rendering/render_paragraph.dart +++ b/examples/rendering/render_paragraph.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:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; diff --git a/examples/rendering/sector_layout.dart b/examples/rendering/sector_layout.dart index 1bafaeb52fc..9e4a9889a41 100644 --- a/examples/rendering/sector_layout.dart +++ b/examples/rendering/sector_layout.dart @@ -5,7 +5,7 @@ import 'dart:math' as math; import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; const double kTwoPi = 2 * math.PI; diff --git a/examples/rendering/shadowed_box.dart b/examples/rendering/shadowed_box.dart index 65f70d73c12..130b13765c5 100644 --- a/examples/rendering/shadowed_box.dart +++ b/examples/rendering/shadowed_box.dart @@ -4,8 +4,8 @@ import 'dart:ui'; -import 'package:sky/rendering.dart'; -import 'package:sky/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/material.dart'; void main() { var coloredBox = new RenderDecoratedBox( diff --git a/examples/rendering/simple_autolayout.dart b/examples/rendering/simple_autolayout.dart index a62dba873fd..086e2354aa5 100644 --- a/examples/rendering/simple_autolayout.dart +++ b/examples/rendering/simple_autolayout.dart @@ -5,7 +5,7 @@ import 'dart:ui'; import 'package:cassowary/cassowary.dart' as al; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; void main() { RenderDecoratedBox c1 = new RenderDecoratedBox( diff --git a/examples/rendering/solid_color_box.dart b/examples/rendering/solid_color_box.dart index 136cd6eeb85..689631796a9 100644 --- a/examples/rendering/solid_color_box.dart +++ b/examples/rendering/solid_color_box.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; class RenderSolidColorBox extends RenderDecoratedBox { final Size desiredSize; diff --git a/examples/rendering/spinning_flex.dart b/examples/rendering/spinning_flex.dart index 6c1455f35bd..ea9ba7651c7 100644 --- a/examples/rendering/spinning_flex.dart +++ b/examples/rendering/spinning_flex.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/rendering.dart'; import 'solid_color_box.dart'; diff --git a/examples/rendering/touch_demo.dart b/examples/rendering/touch_demo.dart index 56c1d64aca0..9a6ec804810 100644 --- a/examples/rendering/touch_demo.dart +++ b/examples/rendering/touch_demo.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; // Material design colors. :p List kColors = [ diff --git a/examples/rendering/transform.dart b/examples/rendering/transform.dart index 9b5d3a041d2..d34758fd3ee 100644 --- a/examples/rendering/transform.dart +++ b/examples/rendering/transform.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; void main() { RenderDecoratedBox green = new RenderDecoratedBox( diff --git a/examples/stocks/lib/main.dart b/examples/stocks/lib/main.dart index 1ba3fdd664c..35c7baf6c54 100644 --- a/examples/stocks/lib/main.dart +++ b/examples/stocks/lib/main.dart @@ -8,9 +8,9 @@ import 'dart:async'; import 'dart:math' as math; import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; import 'stock_data.dart'; diff --git a/examples/stocks/lib/stock_data.dart b/examples/stocks/lib/stock_data.dart index 7326970ad9b..ed7c7265016 100644 --- a/examples/stocks/lib/stock_data.dart +++ b/examples/stocks/lib/stock_data.dart @@ -10,7 +10,7 @@ import 'dart:convert'; import 'dart:math' as math; -import 'package:sky/services.dart'; +import 'package:flutter/services.dart'; final math.Random _rng = new math.Random(); diff --git a/examples/stocks/pubspec.yaml b/examples/stocks/pubspec.yaml index a169d925c0f..23b2d38b84a 100644 --- a/examples/stocks/pubspec.yaml +++ b/examples/stocks/pubspec.yaml @@ -1,9 +1,9 @@ name: stocks dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/widgets/big_switch.dart b/examples/widgets/big_switch.dart index cd812fac336..46a9165a255 100644 --- a/examples/widgets/big_switch.dart +++ b/examples/widgets/big_switch.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:sky/material.dart'; +import 'package:flutter/material.dart'; class BigSwitch extends StatefulComponent { BigSwitch({ this.scale }); diff --git a/examples/widgets/card_collection.dart b/examples/widgets/card_collection.dart index e2f45aee5f3..6cbb9889c1f 100644 --- a/examples/widgets/card_collection.dart +++ b/examples/widgets/card_collection.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; class CardModel { CardModel(this.value, this.height) { diff --git a/examples/widgets/container.dart b/examples/widgets/container.dart index 5a4b9297536..9416f7be7b0 100644 --- a/examples/widgets/container.dart +++ b/examples/widgets/container.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:sky/material.dart'; +import 'package:flutter/material.dart'; class ContainerApp extends StatelessComponent { Widget build(BuildContext context) { diff --git a/examples/widgets/date_picker.dart b/examples/widgets/date_picker.dart index 845af140f6b..8d871dee0d6 100644 --- a/examples/widgets/date_picker.dart +++ b/examples/widgets/date_picker.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:sky/material.dart'; +import 'package:flutter/material.dart'; void main() => runApp(new DatePickerDemo()); diff --git a/examples/widgets/drag_and_drop.dart b/examples/widgets/drag_and_drop.dart index 7de9a6b3485..63f4d736ad9 100644 --- a/examples/widgets/drag_and_drop.dart +++ b/examples/widgets/drag_and_drop.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; class DragData { DragData(this.text); diff --git a/examples/widgets/ensure_visible.dart b/examples/widgets/ensure_visible.dart index fe570fdfda6..e4707f72e15 100644 --- a/examples/widgets/ensure_visible.dart +++ b/examples/widgets/ensure_visible.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:sky/material.dart'; +import 'package:flutter/material.dart'; class CardModel { CardModel(this.value, this.height, this.color); diff --git a/examples/widgets/horizontal_scrolling.dart b/examples/widgets/horizontal_scrolling.dart index 52fae2a1d01..f3b26a50ed8 100644 --- a/examples/widgets/horizontal_scrolling.dart +++ b/examples/widgets/horizontal_scrolling.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; class Circle extends StatelessComponent { Circle({ this.margin: EdgeDims.zero }); diff --git a/examples/widgets/indexed_stack.dart b/examples/widgets/indexed_stack.dart index 5f23624d985..4c0ce831221 100644 --- a/examples/widgets/indexed_stack.dart +++ b/examples/widgets/indexed_stack.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; class IndexedStackDemo extends StatefulComponent { IndexedStackDemo({ this.navigator }); diff --git a/examples/widgets/navigation.dart b/examples/widgets/navigation.dart index 9624c205881..73224f4a620 100644 --- a/examples/widgets/navigation.dart +++ b/examples/widgets/navigation.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:sky/material.dart'; +import 'package:flutter/material.dart'; final Map routes = { '/': (RouteArguments args) => new Container( diff --git a/examples/widgets/overlay_geometry.dart b/examples/widgets/overlay_geometry.dart index 9b28ca113f9..872a2533f65 100644 --- a/examples/widgets/overlay_geometry.dart +++ b/examples/widgets/overlay_geometry.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; class CardModel { CardModel(this.value, this.height, this.color); diff --git a/examples/widgets/pageable_list.dart b/examples/widgets/pageable_list.dart index 05d216d06f1..8dc8c36d1d7 100644 --- a/examples/widgets/pageable_list.dart +++ b/examples/widgets/pageable_list.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; class CardModel { CardModel(this.value, this.size, this.color); diff --git a/examples/widgets/piano.dart b/examples/widgets/piano.dart index 14845b0e2a9..63bf0a40e5d 100644 --- a/examples/widgets/piano.dart +++ b/examples/widgets/piano.dart @@ -4,9 +4,9 @@ import 'package:mojo/mojo/url_response.mojom.dart'; import 'package:sky_services/media/media.mojom.dart'; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.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/examples/widgets/progress_indicator.dart b/examples/widgets/progress_indicator.dart index 511f2484dff..fdf2338008a 100644 --- a/examples/widgets/progress_indicator.dart +++ b/examples/widgets/progress_indicator.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; -import 'package:sky/material.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/material.dart'; class ProgressIndicatorApp extends StatefulComponent { ProgressIndicatorAppState createState() => new ProgressIndicatorAppState(); diff --git a/examples/widgets/pubspec.yaml b/examples/widgets/pubspec.yaml index af25190f71e..e4c55adc07b 100644 --- a/examples/widgets/pubspec.yaml +++ b/examples/widgets/pubspec.yaml @@ -1,9 +1,9 @@ name: widgets dependencies: - sky: any + flutter: any sky_tools: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons - sky: + flutter: path: ../../sky/packages/sky diff --git a/examples/widgets/scale.dart b/examples/widgets/scale.dart index ecd4c8d41f0..47824c82faa 100644 --- a/examples/widgets/scale.dart +++ b/examples/widgets/scale.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; class ScaleApp extends StatefulComponent { ScaleAppState createState() => new ScaleAppState(); diff --git a/examples/widgets/sector.dart b/examples/widgets/sector.dart index d6253c228f2..624ba1541b7 100644 --- a/examples/widgets/sector.dart +++ b/examples/widgets/sector.dart @@ -4,8 +4,8 @@ import 'dart:math' as math; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import '../rendering/sector_layout.dart'; diff --git a/examples/widgets/spinning_mixed.dart b/examples/widgets/spinning_mixed.dart index cfde0b373ac..b59c6e3c743 100644 --- a/examples/widgets/spinning_mixed.dart +++ b/examples/widgets/spinning_mixed.dart @@ -4,9 +4,9 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import '../rendering/solid_color_box.dart'; diff --git a/examples/widgets/styled_text.dart b/examples/widgets/styled_text.dart index 1764acd2274..2603b3c4643 100644 --- a/examples/widgets/styled_text.dart +++ b/examples/widgets/styled_text.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; class StyledTextApp extends StatefulComponent { StyledTextAppState createState() => new StyledTextAppState(); diff --git a/examples/widgets/tabs.dart b/examples/widgets/tabs.dart index cec0e7aa53d..5a84f93234a 100644 --- a/examples/widgets/tabs.dart +++ b/examples/widgets/tabs.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/material.dart'; -import 'package:sky/painting.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/painting.dart'; class TabbedNavigatorApp extends StatefulComponent { TabbedNavigatorAppState createState() => new TabbedNavigatorAppState(); diff --git a/packages/flutter/lib/src/material/card.dart b/packages/flutter/lib/src/material/card.dart index caf2a647d47..4090b3f2a26 100644 --- a/packages/flutter/lib/src/material/card.dart +++ b/packages/flutter/lib/src/material/card.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'material.dart'; diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart index d02619e50eb..1c42cf32efc 100644 --- a/packages/flutter/lib/src/material/checkbox.dart +++ b/packages/flutter/lib/src/material/checkbox.dart @@ -4,12 +4,12 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; -export 'package:sky/rendering.dart' show ValueChanged; +export 'package:flutter/rendering.dart' show ValueChanged; const double _kMidpoint = 0.5; const sky.Color _kLightUncheckedColor = const sky.Color(0x8A000000); diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart index 6e09578e489..12b9227c67d 100644 --- a/packages/flutter/lib/src/material/date_picker.dart +++ b/packages/flutter/lib/src/material/date_picker.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:intl/date_symbols.dart'; import 'package:intl/intl.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'ink_well.dart'; diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart index a3064fe5b21..596ceb61f61 100644 --- a/packages/flutter/lib/src/material/dialog.dart +++ b/packages/flutter/lib/src/material/dialog.dart @@ -4,9 +4,9 @@ import 'dart:async'; -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'material_button.dart'; diff --git a/packages/flutter/lib/src/material/drawer.dart b/packages/flutter/lib/src/material/drawer.dart index 12ebda6b091..8e6dc024f47 100644 --- a/packages/flutter/lib/src/material/drawer.dart +++ b/packages/flutter/lib/src/material/drawer.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'shadows.dart'; diff --git a/packages/flutter/lib/src/material/drawer_divider.dart b/packages/flutter/lib/src/material/drawer_divider.dart index a9f10882709..4816892121a 100644 --- a/packages/flutter/lib/src/material/drawer_divider.dart +++ b/packages/flutter/lib/src/material/drawer_divider.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/drawer_header.dart b/packages/flutter/lib/src/material/drawer_header.dart index e95f1b039d6..8078c0179bd 100644 --- a/packages/flutter/lib/src/material/drawer_header.dart +++ b/packages/flutter/lib/src/material/drawer_header.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'constants.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/drawer_item.dart b/packages/flutter/lib/src/material/drawer_item.dart index 9a89515c659..c5659c5910c 100644 --- a/packages/flutter/lib/src/material/drawer_item.dart +++ b/packages/flutter/lib/src/material/drawer_item.dart @@ -4,9 +4,9 @@ import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'icon.dart'; diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart index 0737afa7602..5def34464a4 100644 --- a/packages/flutter/lib/src/material/flat_button.dart +++ b/packages/flutter/lib/src/material/flat_button.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/gestures.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'material_button.dart'; diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart index 368e3c5ad79..e9b6d83c882 100644 --- a/packages/flutter/lib/src/material/floating_action_button.dart +++ b/packages/flutter/lib/src/material/floating_action_button.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/gestures.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/widgets.dart'; import 'icon.dart'; import 'ink_well.dart'; diff --git a/packages/flutter/lib/src/material/icon.dart b/packages/flutter/lib/src/material/icon.dart index 32facf2a250..d991cd43d4a 100644 --- a/packages/flutter/lib/src/material/icon.dart +++ b/packages/flutter/lib/src/material/icon.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/icon_button.dart b/packages/flutter/lib/src/material/icon_button.dart index dc355e9474b..292bc823e53 100644 --- a/packages/flutter/lib/src/material/icon_button.dart +++ b/packages/flutter/lib/src/material/icon_button.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/widgets.dart'; import 'icon.dart'; diff --git a/packages/flutter/lib/src/material/ink_well.dart b/packages/flutter/lib/src/material/ink_well.dart index 5140bbf1a08..9bb4feddbce 100644 --- a/packages/flutter/lib/src/material/ink_well.dart +++ b/packages/flutter/lib/src/material/ink_well.dart @@ -6,10 +6,10 @@ import 'dart:async'; import 'dart:math' as math; import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; const int _kSplashInitialOpacity = 0x30; const double _kSplashCanceledVelocity = 0.7; diff --git a/packages/flutter/lib/src/material/input.dart b/packages/flutter/lib/src/material/input.dart index 0b2ad3cb175..608601d4d47 100644 --- a/packages/flutter/lib/src/material/input.dart +++ b/packages/flutter/lib/src/material/input.dart @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; -import 'package:sky/services.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; -export 'package:sky/services.dart' show KeyboardType; +export 'package:flutter/services.dart' show KeyboardType; typedef void StringValueChanged(String value); diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart index 614dd0d2a31..03080432d2d 100644 --- a/packages/flutter/lib/src/material/material.dart +++ b/packages/flutter/lib/src/material/material.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/widgets.dart'; import 'constants.dart'; import 'shadows.dart'; diff --git a/packages/flutter/lib/src/material/material_app.dart b/packages/flutter/lib/src/material/material_app.dart index f326b9ff041..afa81b9a28a 100644 --- a/packages/flutter/lib/src/material/material_app.dart +++ b/packages/flutter/lib/src/material/material_app.dart @@ -4,9 +4,9 @@ import 'dart:ui' as sky; -import 'package:sky/painting.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; import 'title.dart'; diff --git a/packages/flutter/lib/src/material/material_button.dart b/packages/flutter/lib/src/material/material_button.dart index 23f28e9353d..0a343e9edc7 100644 --- a/packages/flutter/lib/src/material/material_button.dart +++ b/packages/flutter/lib/src/material/material_button.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/gestures.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'ink_well.dart'; diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart index eee0b9fe251..750d01dcce9 100644 --- a/packages/flutter/lib/src/material/popup_menu.dart +++ b/packages/flutter/lib/src/material/popup_menu.dart @@ -5,9 +5,9 @@ import 'dart:async'; import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/widgets.dart'; import 'ink_well.dart'; import 'popup_menu_item.dart'; diff --git a/packages/flutter/lib/src/material/popup_menu_item.dart b/packages/flutter/lib/src/material/popup_menu_item.dart index d09bda2be11..f785eb838ff 100644 --- a/packages/flutter/lib/src/material/popup_menu_item.dart +++ b/packages/flutter/lib/src/material/popup_menu_item.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/progress_indicator.dart b/packages/flutter/lib/src/material/progress_indicator.dart index cf640a48f5b..c7d0e8c39fa 100644 --- a/packages/flutter/lib/src/material/progress_indicator.dart +++ b/packages/flutter/lib/src/material/progress_indicator.dart @@ -5,8 +5,8 @@ import 'dart:math' as math; import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/radial_reaction.dart b/packages/flutter/lib/src/material/radial_reaction.dart index a3d68db5ee0..409cd647c17 100644 --- a/packages/flutter/lib/src/material/radial_reaction.dart +++ b/packages/flutter/lib/src/material/radial_reaction.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:ui' as sky; import 'dart:ui' show Point, Offset, Color, Paint; -import 'package:sky/animation.dart'; +import 'package:flutter/animation.dart'; const Duration _kShowDuration = const Duration(milliseconds: 300); const Duration _kHideDuration = const Duration(milliseconds: 200); diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart index fc54cc88938..e44f8098970 100644 --- a/packages/flutter/lib/src/material/radio.dart +++ b/packages/flutter/lib/src/material/radio.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart index a41b8624aca..2f1d9f7ce4c 100644 --- a/packages/flutter/lib/src/material/raised_button.dart +++ b/packages/flutter/lib/src/material/raised_button.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/gestures.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'material_button.dart'; diff --git a/packages/flutter/lib/src/material/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart index 3d4fbd85d4a..55a7af32b16 100644 --- a/packages/flutter/lib/src/material/scaffold.dart +++ b/packages/flutter/lib/src/material/scaffold.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'constants.dart'; diff --git a/packages/flutter/lib/src/material/shadows.dart b/packages/flutter/lib/src/material/shadows.dart index 17280dd092e..f9e998eef47 100644 --- a/packages/flutter/lib/src/material/shadows.dart +++ b/packages/flutter/lib/src/material/shadows.dart @@ -4,7 +4,7 @@ import 'dart:ui' show Color, Offset; -import 'package:sky/painting.dart'; +import 'package:flutter/painting.dart'; const Map> shadows = const { 1: const [ diff --git a/packages/flutter/lib/src/material/snack_bar.dart b/packages/flutter/lib/src/material/snack_bar.dart index 7c663fecd23..7aa793e229b 100644 --- a/packages/flutter/lib/src/material/snack_bar.dart +++ b/packages/flutter/lib/src/material/snack_bar.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/widgets.dart'; import 'constants.dart'; import 'material.dart'; diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart index ab9573078bc..5bf21945413 100644 --- a/packages/flutter/lib/src/material/switch.dart +++ b/packages/flutter/lib/src/material/switch.dart @@ -5,15 +5,15 @@ import 'dart:async'; import 'dart:ui' as sky; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'radial_reaction.dart'; import 'shadows.dart'; import 'theme.dart'; -export 'package:sky/rendering.dart' show ValueChanged; +export 'package:flutter/rendering.dart' show ValueChanged; const sky.Color _kThumbOffColor = const sky.Color(0xFFFAFAFA); const sky.Color _kTrackOffColor = const sky.Color(0x42000000); diff --git a/packages/flutter/lib/src/material/tabs.dart b/packages/flutter/lib/src/material/tabs.dart index 8ef3ae424b1..543aebddbdf 100644 --- a/packages/flutter/lib/src/material/tabs.dart +++ b/packages/flutter/lib/src/material/tabs.dart @@ -6,11 +6,11 @@ import 'dart:math' as math; import 'dart:ui' as sky; import 'package:newton/newton.dart'; -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'constants.dart'; diff --git a/packages/flutter/lib/src/material/theme.dart b/packages/flutter/lib/src/material/theme.dart index e46a79ffc47..aeff56fb43f 100644 --- a/packages/flutter/lib/src/material/theme.dart +++ b/packages/flutter/lib/src/material/theme.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'theme_data.dart'; diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart index bee746dd97b..f5a8e1fabd3 100644 --- a/packages/flutter/lib/src/material/theme_data.dart +++ b/packages/flutter/lib/src/material/theme_data.dart @@ -4,8 +4,8 @@ import 'dart:ui'; -import 'package:sky/src/material/typography.dart'; -import 'package:sky/src/material/colors.dart'; +import 'package:flutter/src/material/typography.dart'; +import 'package:flutter/src/material/colors.dart'; enum ThemeBrightness { dark, light } diff --git a/packages/flutter/lib/src/material/title.dart b/packages/flutter/lib/src/material/title.dart index bcba1421c4a..deca5d18b81 100644 --- a/packages/flutter/lib/src/material/title.dart +++ b/packages/flutter/lib/src/material/title.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'theme.dart'; diff --git a/packages/flutter/lib/src/material/tool_bar.dart b/packages/flutter/lib/src/material/tool_bar.dart index 6be4c60d653..5629b1d5fb7 100644 --- a/packages/flutter/lib/src/material/tool_bar.dart +++ b/packages/flutter/lib/src/material/tool_bar.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/painting.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/widgets.dart'; import 'constants.dart'; import 'icon.dart'; diff --git a/packages/flutter/lib/src/material/typography.dart b/packages/flutter/lib/src/material/typography.dart index 28ad98ffb24..396b0acd1fa 100644 --- a/packages/flutter/lib/src/material/typography.dart +++ b/packages/flutter/lib/src/material/typography.dart @@ -6,8 +6,8 @@ import 'dart:ui' show Color; -import 'package:sky/painting.dart'; -import 'package:sky/src/material/colors.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/src/material/colors.dart'; // TODO(eseidel): Font weights are supposed to be language relative! // TODO(jackson): Baseline should be language relative! diff --git a/packages/flutter/lib/src/painting/box_painter.dart b/packages/flutter/lib/src/painting/box_painter.dart index 4eb16eb1f4d..110aa4421e6 100644 --- a/packages/flutter/lib/src/painting/box_painter.dart +++ b/packages/flutter/lib/src/painting/box_painter.dart @@ -6,7 +6,7 @@ import 'dart:math' as math; import 'dart:ui' as sky; import 'dart:ui' show Point, Offset, Size, Rect, Color, Paint, Path; -import 'package:sky/services.dart'; +import 'package:flutter/services.dart'; import 'shadows.dart'; diff --git a/packages/flutter/lib/src/rendering/binding.dart b/packages/flutter/lib/src/rendering/binding.dart index 8c1f9ab59ee..d2a6526bf33 100644 --- a/packages/flutter/lib/src/rendering/binding.dart +++ b/packages/flutter/lib/src/rendering/binding.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; import 'box.dart'; import 'hit_test.dart'; diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart index 96c107c2616..3a3c52d7e1e 100644 --- a/packages/flutter/lib/src/rendering/box.dart +++ b/packages/flutter/lib/src/rendering/box.dart @@ -5,13 +5,13 @@ import 'dart:math' as math; import 'dart:ui' as sky; -import 'package:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'package:vector_math/vector_math_64.dart'; import 'debug.dart'; import 'object.dart'; -export 'package:sky/painting.dart' show TextBaseline; +export 'package:flutter/painting.dart' show TextBaseline; // This class should only be used in debug builds class _DebugSize extends Size { diff --git a/packages/flutter/lib/src/rendering/editable_paragraph.dart b/packages/flutter/lib/src/rendering/editable_paragraph.dart index 95b0886772c..31c18372ade 100644 --- a/packages/flutter/lib/src/rendering/editable_paragraph.dart +++ b/packages/flutter/lib/src/rendering/editable_paragraph.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:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'box.dart'; import 'object.dart'; diff --git a/packages/flutter/lib/src/rendering/image.dart b/packages/flutter/lib/src/rendering/image.dart index c8022e1db32..eda96186634 100644 --- a/packages/flutter/lib/src/rendering/image.dart +++ b/packages/flutter/lib/src/rendering/image.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'box.dart'; import 'object.dart'; diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart index f78673f2f1e..a08076585e6 100644 --- a/packages/flutter/lib/src/rendering/object.dart +++ b/packages/flutter/lib/src/rendering/object.dart @@ -6,7 +6,7 @@ import 'dart:math' as math; import 'dart:ui' as sky; import 'dart:ui' show Point, Offset, Size, Rect, Color, Paint, Path; -import 'package:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'package:vector_math/vector_math_64.dart'; import 'debug.dart'; diff --git a/packages/flutter/lib/src/rendering/paragraph.dart b/packages/flutter/lib/src/rendering/paragraph.dart index 2abd06904ee..67bbfc0baae 100644 --- a/packages/flutter/lib/src/rendering/paragraph.dart +++ b/packages/flutter/lib/src/rendering/paragraph.dart @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'box.dart'; import 'object.dart'; -export 'package:sky/src/painting/text_painter.dart'; +export 'package:flutter/src/painting/text_painter.dart'; /// A render object that displays a paragraph of text class RenderParagraph extends RenderBox { diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart index 3ae758a924f..24dc33bf9a1 100644 --- a/packages/flutter/lib/src/rendering/proxy_box.dart +++ b/packages/flutter/lib/src/rendering/proxy_box.dart @@ -4,13 +4,13 @@ import 'dart:ui' as sky; -import 'package:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'package:vector_math/vector_math_64.dart'; import 'box.dart'; import 'object.dart'; -export 'package:sky/src/painting/box_painter.dart'; +export 'package:flutter/src/painting/box_painter.dart'; /// A base class for render objects that resemble their children /// diff --git a/packages/flutter/lib/src/rendering/shifted_box.dart b/packages/flutter/lib/src/rendering/shifted_box.dart index e15675342ea..6cab77827bb 100644 --- a/packages/flutter/lib/src/rendering/shifted_box.dart +++ b/packages/flutter/lib/src/rendering/shifted_box.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:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'box.dart'; import 'object.dart'; diff --git a/packages/flutter/lib/src/rendering/toggleable.dart b/packages/flutter/lib/src/rendering/toggleable.dart index f1b1b9b6f7a..f5df71db1ec 100644 --- a/packages/flutter/lib/src/rendering/toggleable.dart +++ b/packages/flutter/lib/src/rendering/toggleable.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; import 'binding.dart'; import 'box.dart'; diff --git a/packages/flutter/lib/src/rendering/view.dart b/packages/flutter/lib/src/rendering/view.dart index 6289200eede..9e8a07bfd1d 100644 --- a/packages/flutter/lib/src/rendering/view.dart +++ b/packages/flutter/lib/src/rendering/view.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'package:vector_math/vector_math_64.dart'; import 'box.dart'; diff --git a/packages/flutter/lib/src/widgets/animated_container.dart b/packages/flutter/lib/src/widgets/animated_container.dart index 5734cfb8cc4..307fdd431ff 100644 --- a/packages/flutter/lib/src/widgets/animated_container.dart +++ b/packages/flutter/lib/src/widgets/animated_container.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:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'basic.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 99bf338173f..afde446e3e9 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -4,12 +4,12 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; import 'framework.dart'; -export 'package:sky/rendering.dart' show +export 'package:flutter/rendering.dart' show BackgroundImage, BlockDirection, Border, diff --git a/packages/flutter/lib/src/widgets/binding.dart b/packages/flutter/lib/src/widgets/binding.dart index d6b6393a2f5..c73678c52e9 100644 --- a/packages/flutter/lib/src/widgets/binding.dart +++ b/packages/flutter/lib/src/widgets/binding.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/rendering.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/dismissable.dart b/packages/flutter/lib/src/widgets/dismissable.dart index 8114b58d07b..6659d61ec13 100644 --- a/packages/flutter/lib/src/widgets/dismissable.dart +++ b/packages/flutter/lib/src/widgets/dismissable.dart @@ -4,7 +4,7 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'basic.dart'; import 'transitions.dart'; diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart index 672dfbbca78..8ea0cb8e37e 100644 --- a/packages/flutter/lib/src/widgets/drag_target.dart +++ b/packages/flutter/lib/src/widgets/drag_target.dart @@ -5,8 +5,8 @@ import 'dart:collection'; import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/rendering.dart'; import 'basic.dart'; import 'binding.dart'; diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index 0990eded4fb..c2dc68b9f3f 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/packages/flutter/lib/src/widgets/editable_text.dart @@ -5,8 +5,8 @@ import 'dart:async'; import 'package:mojo_services/keyboard/keyboard.mojom.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; import 'basic.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index e1fc342b19d..6df59d33c66 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; // KEYS diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart index 22b9b7e347d..288ae057632 100644 --- a/packages/flutter/lib/src/widgets/gesture_detector.dart +++ b/packages/flutter/lib/src/widgets/gesture_detector.dart @@ -4,8 +4,8 @@ import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/rendering.dart'; import 'basic.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/homogeneous_viewport.dart b/packages/flutter/lib/src/widgets/homogeneous_viewport.dart index 18ac69adeeb..54f33506a26 100644 --- a/packages/flutter/lib/src/widgets/homogeneous_viewport.dart +++ b/packages/flutter/lib/src/widgets/homogeneous_viewport.dart @@ -4,9 +4,9 @@ import 'dart:math' as math; -import 'package:sky/rendering.dart'; -import 'package:sky/src/widgets/framework.dart'; -import 'package:sky/src/widgets/basic.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/src/widgets/framework.dart'; +import 'package:flutter/src/widgets/basic.dart'; typedef List ListBuilder(BuildContext context, int startIndex, int count); diff --git a/packages/flutter/lib/src/widgets/mimic.dart b/packages/flutter/lib/src/widgets/mimic.dart index 69006782cab..6170daa36e6 100644 --- a/packages/flutter/lib/src/widgets/mimic.dart +++ b/packages/flutter/lib/src/widgets/mimic.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:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'basic.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/mixed_viewport.dart b/packages/flutter/lib/src/widgets/mixed_viewport.dart index 3941ec81b91..83a2bf6c3b1 100644 --- a/packages/flutter/lib/src/widgets/mixed_viewport.dart +++ b/packages/flutter/lib/src/widgets/mixed_viewport.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:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'framework.dart'; import 'basic.dart'; diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart index c6345a1a029..c326efd7472 100644 --- a/packages/flutter/lib/src/widgets/navigator.dart +++ b/packages/flutter/lib/src/widgets/navigator.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:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'basic.dart'; import 'focus.dart'; diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index 6fe36e3394f..0ae33f9a7e3 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -7,9 +7,9 @@ import 'dart:math' as math; import 'dart:ui' as sky; import 'package:newton/newton.dart'; -import 'package:sky/animation.dart'; -import 'package:sky/gestures.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/rendering.dart'; import 'basic.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/statistics_overlay.dart b/packages/flutter/lib/src/widgets/statistics_overlay.dart index 80fa77915e3..6784fa9c6b4 100644 --- a/packages/flutter/lib/src/widgets/statistics_overlay.dart +++ b/packages/flutter/lib/src/widgets/statistics_overlay.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:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'framework.dart'; diff --git a/packages/flutter/lib/src/widgets/transitions.dart b/packages/flutter/lib/src/widgets/transitions.dart index 71e9a985acc..3749e8d987c 100644 --- a/packages/flutter/lib/src/widgets/transitions.dart +++ b/packages/flutter/lib/src/widgets/transitions.dart @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'package:vector_math/vector_math_64.dart'; import 'basic.dart'; import 'framework.dart'; -export 'package:sky/animation.dart' show AnimationDirection; +export 'package:flutter/animation.dart' show AnimationDirection; abstract class TransitionComponent extends StatefulComponent { TransitionComponent({ diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index bcf8676157a..b3c9933bae4 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -1,4 +1,4 @@ -name: sky +name: flutter version: 0.0.55 author: Flutter Authors description: A framework for writing Flutter applications diff --git a/packages/flutter_sprites/lib/skysprites.dart b/packages/flutter_sprites/lib/skysprites.dart index 6669d8071ce..62b2669e7a8 100644 --- a/packages/flutter_sprites/lib/skysprites.dart +++ b/packages/flutter_sprites/lib/skysprites.dart @@ -13,11 +13,11 @@ import 'dart:ui' as sky; import 'package:box2d/box2d.dart' as box2d; import 'package:mojo/core.dart'; import 'package:sky_services/media/media.mojom.dart'; -import 'package:sky/animation.dart'; -import 'package:sky/painting.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; import 'package:vector_math/vector_math_64.dart'; part 'action.dart'; diff --git a/packages/flutter_sprites/pubspec.yaml b/packages/flutter_sprites/pubspec.yaml index b2fbf544108..6ae19a67fb8 100644 --- a/packages/flutter_sprites/pubspec.yaml +++ b/packages/flutter_sprites/pubspec.yaml @@ -4,9 +4,9 @@ version: 0.0.1 author: Flutter Authors homepage: http://flutter.io dependencies: - sky: ">=0.0.36 < 0.1.0" + flutter: ">=0.0.36 < 0.1.0" sky_tools: ">=0.0.10 < 0.1.0" box2d: any dependency_overrides: - sky: + flutter: path: ../sky/packages/sky diff --git a/packages/unit/pubspec.yaml b/packages/unit/pubspec.yaml index d91cb48ef20..51606f08b67 100644 --- a/packages/unit/pubspec.yaml +++ b/packages/unit/pubspec.yaml @@ -1,11 +1,11 @@ name: sky_unit_tests dependencies: - sky: any + flutter: any sky_tools: any test: any quiver: any dependency_overrides: material_design_icons: path: ../packages/material_design_icons - sky: + flutter: path: ../packages/sky diff --git a/packages/unit/test/animation/scheduler_test.dart b/packages/unit/test/animation/scheduler_test.dart index 62f9379c3da..89abadbcb0b 100644 --- a/packages/unit/test/animation/scheduler_test.dart +++ b/packages/unit/test/animation/scheduler_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/animation.dart'; +import 'package:flutter/animation.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/unit/test/gestures/arena_test.dart b/packages/unit/test/gestures/arena_test.dart index f9b8c84777a..ccc861b50a3 100644 --- a/packages/unit/test/gestures/arena_test.dart +++ b/packages/unit/test/gestures/arena_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; typedef void GestureArenaCallback(Object key); diff --git a/packages/unit/test/gestures/long_press_test.dart b/packages/unit/test/gestures/long_press_test.dart index 85995d1c58f..8fb8022dcc0 100644 --- a/packages/unit/test/gestures/long_press_test.dart +++ b/packages/unit/test/gestures/long_press_test.dart @@ -1,5 +1,5 @@ import 'package:quiver/testing/async.dart'; -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/pointer_router_test.dart b/packages/unit/test/gestures/pointer_router_test.dart index e9a67f3f3cd..6c158968568 100644 --- a/packages/unit/test/gestures/pointer_router_test.dart +++ b/packages/unit/test/gestures/pointer_router_test.dart @@ -1,6 +1,6 @@ import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/scale_test.dart b/packages/unit/test/gestures/scale_test.dart index 6e5d59e94d4..be19bada547 100644 --- a/packages/unit/test/gestures/scale_test.dart +++ b/packages/unit/test/gestures/scale_test.dart @@ -1,6 +1,6 @@ import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/scroll_test.dart b/packages/unit/test/gestures/scroll_test.dart index e0ded8ffce7..e29adafc765 100644 --- a/packages/unit/test/gestures/scroll_test.dart +++ b/packages/unit/test/gestures/scroll_test.dart @@ -1,6 +1,6 @@ import 'dart:ui' as sky; -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/show_press_test.dart b/packages/unit/test/gestures/show_press_test.dart index b9e1fb35ee4..6a2005d3a8c 100644 --- a/packages/unit/test/gestures/show_press_test.dart +++ b/packages/unit/test/gestures/show_press_test.dart @@ -1,5 +1,5 @@ import 'package:quiver/testing/async.dart'; -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/tap_test.dart b/packages/unit/test/gestures/tap_test.dart index 058e18bd1b7..c41860ca11b 100644 --- a/packages/unit/test/gestures/tap_test.dart +++ b/packages/unit/test/gestures/tap_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/gestures.dart'; +import 'package:flutter/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/painting/edge_dims_test.dart b/packages/unit/test/painting/edge_dims_test.dart index bfcb4583f38..5dbc3b87f2f 100644 --- a/packages/unit/test/painting/edge_dims_test.dart +++ b/packages/unit/test/painting/edge_dims_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/painting.dart'; +import 'package:flutter/painting.dart'; import 'package:test/test.dart'; diff --git a/packages/unit/test/rendering/box_test.dart b/packages/unit/test/rendering/box_test.dart index e0df0fd56a7..878237fbb17 100644 --- a/packages/unit/test/rendering/box_test.dart +++ b/packages/unit/test/rendering/box_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/material.dart'; -import 'package:sky/rendering.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/flex_test.dart b/packages/unit/test/rendering/flex_test.dart index a27ef65b53f..4ce08a1233c 100644 --- a/packages/unit/test/rendering/flex_test.dart +++ b/packages/unit/test/rendering/flex_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/grid_test.dart b/packages/unit/test/rendering/grid_test.dart index 2a517ea0b33..60852a2e8a8 100644 --- a/packages/unit/test/rendering/grid_test.dart +++ b/packages/unit/test/rendering/grid_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/image_test.dart b/packages/unit/test/rendering/image_test.dart index be0e6f7be98..2ee22468b6e 100644 --- a/packages/unit/test/rendering/image_test.dart +++ b/packages/unit/test/rendering/image_test.dart @@ -1,6 +1,6 @@ import 'dart:ui' as sky; -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/intrinsic_width_test.dart b/packages/unit/test/rendering/intrinsic_width_test.dart index e7b636f0322..de28dbab9ab 100644 --- a/packages/unit/test/rendering/intrinsic_width_test.dart +++ b/packages/unit/test/rendering/intrinsic_width_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/positioned_box_test.dart b/packages/unit/test/rendering/positioned_box_test.dart index 90e81e50d04..aaa783efc19 100644 --- a/packages/unit/test/rendering/positioned_box_test.dart +++ b/packages/unit/test/rendering/positioned_box_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/rendering_tester.dart b/packages/unit/test/rendering/rendering_tester.dart index f4fa015ff6e..10e596d555d 100644 --- a/packages/unit/test/rendering/rendering_tester.dart +++ b/packages/unit/test/rendering/rendering_tester.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; const Size _kTestViewSize = const Size(800.0, 600.0); diff --git a/packages/unit/test/rendering/size_test.dart b/packages/unit/test/rendering/size_test.dart index 76e84bcda2c..8d7672713a7 100644 --- a/packages/unit/test/rendering/size_test.dart +++ b/packages/unit/test/rendering/size_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/stack_test.dart b/packages/unit/test/rendering/stack_test.dart index 1fbdf481a2e..8a2fb726d6c 100644 --- a/packages/unit/test/rendering/stack_test.dart +++ b/packages/unit/test/rendering/stack_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/rendering/viewport_test.dart b/packages/unit/test/rendering/viewport_test.dart index 0596bd655cb..dae2c93acd8 100644 --- a/packages/unit/test/rendering/viewport_test.dart +++ b/packages/unit/test/rendering/viewport_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/rendering.dart'; +import 'package:flutter/rendering.dart'; import 'package:test/test.dart'; import 'rendering_tester.dart'; diff --git a/packages/unit/test/services/mock_services.dart b/packages/unit/test/services/mock_services.dart index 7ba79e184d1..06242c5958d 100644 --- a/packages/unit/test/services/mock_services.dart +++ b/packages/unit/test/services/mock_services.dart @@ -1,4 +1,4 @@ -import 'package:sky/src/services/shell.dart' as shell; +import 'package:flutter/src/services/shell.dart' as shell; // Tests can use ServiceMocker to register replacement implementations // of Mojo services. diff --git a/packages/unit/test/widget/align_test.dart b/packages/unit/test/widget/align_test.dart index 40f617b837d..48343cba4dc 100644 --- a/packages/unit/test/widget/align_test.dart +++ b/packages/unit/test/widget/align_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/animated_container_test.dart b/packages/unit/test/widget/animated_container_test.dart index b98cee45e9e..c54beb01ea0 100644 --- a/packages/unit/test/widget/animated_container_test.dart +++ b/packages/unit/test/widget/animated_container_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/block_test.dart b/packages/unit/test/widget/block_test.dart index 1f3c9eb3ed8..141313ea2b1 100644 --- a/packages/unit/test/widget/block_test.dart +++ b/packages/unit/test/widget/block_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/widget/box_decoration_test.dart b/packages/unit/test/widget/box_decoration_test.dart index 5c162430647..57bdcd460c5 100644 --- a/packages/unit/test/widget/box_decoration_test.dart +++ b/packages/unit/test/widget/box_decoration_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/material.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/build_scope_test.dart b/packages/unit/test/widget/build_scope_test.dart index d54c4f534bc..477d4612c55 100644 --- a/packages/unit/test/widget/build_scope_test.dart +++ b/packages/unit/test/widget/build_scope_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/center_test.dart b/packages/unit/test/widget/center_test.dart index a8d74b806d9..340e08de9fe 100644 --- a/packages/unit/test/widget/center_test.dart +++ b/packages/unit/test/widget/center_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/coordinates_test.dart b/packages/unit/test/widget/coordinates_test.dart index 460d2e45a6c..e6ee66bb9f0 100644 --- a/packages/unit/test/widget/coordinates_test.dart +++ b/packages/unit/test/widget/coordinates_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/date_picker_test.dart b/packages/unit/test/widget/date_picker_test.dart index 975cbe3f42f..d0c00eee679 100644 --- a/packages/unit/test/widget/date_picker_test.dart +++ b/packages/unit/test/widget/date_picker_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/material.dart'; +import 'package:flutter/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/dismissable_test.dart b/packages/unit/test/widget/dismissable_test.dart index bb4086e65fd..b9a7b5f3cc9 100644 --- a/packages/unit/test/widget/dismissable_test.dart +++ b/packages/unit/test/widget/dismissable_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/widget/draggable_test.dart b/packages/unit/test/widget/draggable_test.dart index 8e8b224d2aa..fc7ad010933 100644 --- a/packages/unit/test/widget/draggable_test.dart +++ b/packages/unit/test/widget/draggable_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/widget/drawer_test.dart b/packages/unit/test/widget/drawer_test.dart index 2e976af0863..9cbea0686e4 100644 --- a/packages/unit/test/widget/drawer_test.dart +++ b/packages/unit/test/widget/drawer_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/material.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/duplicate_key_test.dart b/packages/unit/test/widget/duplicate_key_test.dart index 39ce16ed821..ff9f59d167c 100644 --- a/packages/unit/test/widget/duplicate_key_test.dart +++ b/packages/unit/test/widget/duplicate_key_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/flex_test.dart b/packages/unit/test/widget/flex_test.dart index 2b6044ce579..a1e58afcc47 100644 --- a/packages/unit/test/widget/flex_test.dart +++ b/packages/unit/test/widget/flex_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/focus_test.dart b/packages/unit/test/widget/focus_test.dart index 8806e6e30b8..b4c04277325 100644 --- a/packages/unit/test/widget/focus_test.dart +++ b/packages/unit/test/widget/focus_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/fractionally_sized_box_test.dart b/packages/unit/test/widget/fractionally_sized_box_test.dart index 6ab3d21d5dc..537c7bb7043 100644 --- a/packages/unit/test/widget/fractionally_sized_box_test.dart +++ b/packages/unit/test/widget/fractionally_sized_box_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/gesture_detector_test.dart b/packages/unit/test/widget/gesture_detector_test.dart index 206b8e866fe..56cd9b337e3 100644 --- a/packages/unit/test/widget/gesture_detector_test.dart +++ b/packages/unit/test/widget/gesture_detector_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/widget/homogeneous_viewport_test.dart b/packages/unit/test/widget/homogeneous_viewport_test.dart index 3b428182165..87131c23acf 100644 --- a/packages/unit/test/widget/homogeneous_viewport_test.dart +++ b/packages/unit/test/widget/homogeneous_viewport_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/input_test.dart b/packages/unit/test/widget/input_test.dart index e2bfbad04fe..42a12123eb6 100644 --- a/packages/unit/test/widget/input_test.dart +++ b/packages/unit/test/widget/input_test.dart @@ -1,7 +1,7 @@ import 'package:mojo_services/keyboard/keyboard.mojom.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/services.dart'; -import 'package:sky/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/listener_test.dart b/packages/unit/test/widget/listener_test.dart index bdd7a8002ae..804494b73c5 100644 --- a/packages/unit/test/widget/listener_test.dart +++ b/packages/unit/test/widget/listener_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/mixed_viewport_test.dart b/packages/unit/test/widget/mixed_viewport_test.dart index b72562e8305..59037ef753a 100644 --- a/packages/unit/test/widget/mixed_viewport_test.dart +++ b/packages/unit/test/widget/mixed_viewport_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/multichild_test.dart b/packages/unit/test/widget/multichild_test.dart index 0a87970e1b7..6db41dc6b3f 100644 --- a/packages/unit/test/widget/multichild_test.dart +++ b/packages/unit/test/widget/multichild_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'test_widgets.dart'; diff --git a/packages/unit/test/widget/navigator_test.dart b/packages/unit/test/widget/navigator_test.dart index a9bfcd5e630..5dfb8f0e683 100644 --- a/packages/unit/test/widget/navigator_test.dart +++ b/packages/unit/test/widget/navigator_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/pageable_list_test.dart b/packages/unit/test/widget/pageable_list_test.dart index e282e69ef67..fe406532b1b 100644 --- a/packages/unit/test/widget/pageable_list_test.dart +++ b/packages/unit/test/widget/pageable_list_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/parent_data_test.dart b/packages/unit/test/widget/parent_data_test.dart index f4892185962..2d692d09566 100644 --- a/packages/unit/test/widget/parent_data_test.dart +++ b/packages/unit/test/widget/parent_data_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'test_widgets.dart'; diff --git a/packages/unit/test/widget/progress_indicator_test.dart b/packages/unit/test/widget/progress_indicator_test.dart index 849818b3dea..de3541b24d6 100644 --- a/packages/unit/test/widget/progress_indicator_test.dart +++ b/packages/unit/test/widget/progress_indicator_test.dart @@ -1,6 +1,6 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/render_object_widget_test.dart b/packages/unit/test/widget/render_object_widget_test.dart index 57335b57d80..76088a69985 100644 --- a/packages/unit/test/widget/render_object_widget_test.dart +++ b/packages/unit/test/widget/render_object_widget_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/reparent_state_test.dart b/packages/unit/test/widget/reparent_state_test.dart index ec771415e79..804837f8f82 100644 --- a/packages/unit/test/widget/reparent_state_test.dart +++ b/packages/unit/test/widget/reparent_state_test.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/scrollable_list_hit_testing_test.dart b/packages/unit/test/widget/scrollable_list_hit_testing_test.dart index 32073bea3b0..2a392d584fd 100644 --- a/packages/unit/test/widget/scrollable_list_hit_testing_test.dart +++ b/packages/unit/test/widget/scrollable_list_hit_testing_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/scrollable_list_horizontal_test.dart b/packages/unit/test/widget/scrollable_list_horizontal_test.dart index 506bf58bb22..94cdd51986e 100644 --- a/packages/unit/test/widget/scrollable_list_horizontal_test.dart +++ b/packages/unit/test/widget/scrollable_list_horizontal_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/scrollable_list_vertical_test.dart b/packages/unit/test/widget/scrollable_list_vertical_test.dart index 8effa156840..3998cef58a5 100644 --- a/packages/unit/test/widget/scrollable_list_vertical_test.dart +++ b/packages/unit/test/widget/scrollable_list_vertical_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/set_state_3_test.dart b/packages/unit/test/widget/set_state_3_test.dart index b78ab070eb0..cfc2e3fc932 100644 --- a/packages/unit/test/widget/set_state_3_test.dart +++ b/packages/unit/test/widget/set_state_3_test.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:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/set_state_test.dart b/packages/unit/test/widget/set_state_test.dart index adb9239b0e0..f396a0778c6 100644 --- a/packages/unit/test/widget/set_state_test.dart +++ b/packages/unit/test/widget/set_state_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/widget/shader_mask_test.dart b/packages/unit/test/widget/shader_mask_test.dart index 9fc0bae9e2b..379ff9b5720 100644 --- a/packages/unit/test/widget/shader_mask_test.dart +++ b/packages/unit/test/widget/shader_mask_test.dart @@ -1,7 +1,7 @@ import 'dart:ui' as sky; -import 'package:sky/painting.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/painting.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/size_observer_test.dart b/packages/unit/test/widget/size_observer_test.dart index 6b9b1cadbc8..95f9e44eeb1 100644 --- a/packages/unit/test/widget/size_observer_test.dart +++ b/packages/unit/test/widget/size_observer_test.dart @@ -1,6 +1,6 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/snack_bar_test.dart b/packages/unit/test/widget/snack_bar_test.dart index 4ddfd843829..1c3fb697fe8 100644 --- a/packages/unit/test/widget/snack_bar_test.dart +++ b/packages/unit/test/widget/snack_bar_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/material.dart'; +import 'package:flutter/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/snap_scrolling_test.dart b/packages/unit/test/widget/snap_scrolling_test.dart index c5c0bb66078..9a193b4259a 100644 --- a/packages/unit/test/widget/snap_scrolling_test.dart +++ b/packages/unit/test/widget/snap_scrolling_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/stack_test.dart b/packages/unit/test/widget/stack_test.dart index b075aaca930..6bf00668b11 100644 --- a/packages/unit/test/widget/stack_test.dart +++ b/packages/unit/test/widget/stack_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/stateful_component_test.dart b/packages/unit/test/widget/stateful_component_test.dart index 694e6613eba..7e7f620a904 100644 --- a/packages/unit/test/widget/stateful_component_test.dart +++ b/packages/unit/test/widget/stateful_component_test.dart @@ -1,5 +1,5 @@ -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/stateful_components_test.dart b/packages/unit/test/widget/stateful_components_test.dart index e52e4fd6ad8..828611e4c16 100644 --- a/packages/unit/test/widget/stateful_components_test.dart +++ b/packages/unit/test/widget/stateful_components_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/syncing_test.dart b/packages/unit/test/widget/syncing_test.dart index c8849b6cf8f..bf6bf8ecb9c 100644 --- a/packages/unit/test/widget/syncing_test.dart +++ b/packages/unit/test/widget/syncing_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/test_widgets.dart b/packages/unit/test/widget/test_widgets.dart index 62c2dd0135e..f132925cac1 100644 --- a/packages/unit/test/widget/test_widgets.dart +++ b/packages/unit/test/widget/test_widgets.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/transform_test.dart b/packages/unit/test/widget/transform_test.dart index 1fff18fe1cd..d9c2a47bb5e 100644 --- a/packages/unit/test/widget/transform_test.dart +++ b/packages/unit/test/widget/transform_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/widget_tester.dart b/packages/unit/test/widget/widget_tester.dart index 95964f3e984..284afb000b5 100644 --- a/packages/unit/test/widget/widget_tester.dart +++ b/packages/unit/test/widget/widget_tester.dart @@ -1,8 +1,8 @@ import 'dart:ui' as sky; -import 'package:sky/animation.dart'; -import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:flutter/animation.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; import 'package:quiver/testing/async.dart'; import 'package:quiver/time.dart'; diff --git a/packages/updater/lib/main.dart b/packages/updater/lib/main.dart index ea168da2998..5d0b0a6fcd6 100644 --- a/packages/updater/lib/main.dart +++ b/packages/updater/lib/main.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:io'; import 'package:mojo/core.dart'; -import 'package:sky/services.dart'; +import 'package:flutter/services.dart'; import 'package:sky_services/updater/update_service.mojom.dart'; import 'package:path/path.dart' as path; import 'package:yaml/yaml.dart' as yaml; diff --git a/packages/updater/pubspec.yaml b/packages/updater/pubspec.yaml index ffff0472572..df785487859 100644 --- a/packages/updater/pubspec.yaml +++ b/packages/updater/pubspec.yaml @@ -5,12 +5,12 @@ description: The autoupdater for flutter homepage: http://flutter.io dependencies: mojo: '>=0.2.0 <0.3.0' - sky: any + flutter: any sky_services: any path: any yaml: any dependency_overrides: - sky: + flutter: path: ../sky environment: sdk: '>=1.12.0 <2.0.0'