Rename package:sky to package:flutter

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({

examples/address_book/pubspec.yaml

 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

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)

examples/demo_launcher/pubspec.yaml

 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

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';

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;
 

examples/fitness/pubspec.yaml

 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

examples/game/example_effect_line.dart

-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() {

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';
 

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';

examples/game/pubspec.yaml

 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

examples/game/test_bed.dart

 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() {

examples/game/test_drawatlas.dart

 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() {

examples/game/test_performance.dart

 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() {

examples/game/test_physics.dart

 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() {

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!')));

examples/hello_world/pubspec.yaml

 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

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,

examples/mine_digger/pubspec.yaml

 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

examples/raw/pubspec.yaml

 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

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;
 

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';
 

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(

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(

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() {

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';
 

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';
 

examples/rendering/pubspec.yaml

 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

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';
 

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';
 

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;
 

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(

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(

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;

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';
 

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<Color> kColors = [

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(

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';
 

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();
 

examples/stocks/pubspec.yaml

 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

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 });

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) {

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) {

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());
 

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);

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);

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 });

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 });

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<String, RouteBuilder> routes = <String, RouteBuilder>{
   '/': (RouteArguments args) => new Container(

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);

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);

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";

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();

examples/widgets/pubspec.yaml

 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

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();

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';
 

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';
 

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();

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();

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';
 

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);

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';

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';

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';

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';
 

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';

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';

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';

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';

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';
 

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';
 

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;

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);
 

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';

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';

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';

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';

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';
 

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';
 

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);

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';
 

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';

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';
 

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<int, List<BoxShadow>> shadows = const {
   1: const [

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';

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);

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';

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';
 

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 }
 

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';
 

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';

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!

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';
 

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';

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 {

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';

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';

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';

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 {

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
 ///

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';

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';

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';

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';

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,

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';
 

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';

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';

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';

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
 

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';

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<Widget> ListBuilder(BuildContext context, int startIndex, int count);
 

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';

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';

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';

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';

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';
 

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({

packages/flutter/pubspec.yaml

-name: sky
+name: flutter
 version: 0.0.55
 author: Flutter Authors <flutter-dev@googlegroups.com>
 description: A framework for writing Flutter applications

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';

packages/flutter_sprites/pubspec.yaml

@@ -4,9 +4,9 @@ version: 0.0.1
 author: Flutter Authors <flutter-dev@googlegroups.com>
 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

packages/unit/pubspec.yaml

 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

packages/unit/test/animation/scheduler_test.dart

-import 'package:sky/animation.dart';
+import 'package:flutter/animation.dart';
 import 'package:test/test.dart';
 
 void main() {

packages/unit/test/gestures/arena_test.dart

-import 'package:sky/gestures.dart';
+import 'package:flutter/gestures.dart';
 import 'package:test/test.dart';
 
 typedef void GestureArenaCallback(Object key);

packages/unit/test/gestures/long_press_test.dart

 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';

packages/unit/test/gestures/pointer_router_test.dart

 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';

packages/unit/test/gestures/scale_test.dart

 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';

packages/unit/test/gestures/scroll_test.dart

 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';

packages/unit/test/gestures/show_press_test.dart

 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';

packages/unit/test/gestures/tap_test.dart

-import 'package:sky/gestures.dart';
+import 'package:flutter/gestures.dart';
 import 'package:test/test.dart';
 
 import '../engine/mock_events.dart';

packages/unit/test/painting/edge_dims_test.dart

-import 'package:sky/painting.dart';
+import 'package:flutter/painting.dart';
 
 import 'package:test/test.dart';
 

packages/unit/test/rendering/box_test.dart

-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';

packages/unit/test/rendering/flex_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/grid_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/image_test.dart

 import 'dart:ui' as sky;
 
-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/intrinsic_width_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/positioned_box_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/rendering_tester.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 
 const Size _kTestViewSize = const Size(800.0, 600.0);
 

packages/unit/test/rendering/size_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/stack_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/rendering/viewport_test.dart

-import 'package:sky/rendering.dart';
+import 'package:flutter/rendering.dart';
 import 'package:test/test.dart';
 
 import 'rendering_tester.dart';

packages/unit/test/services/mock_services.dart

-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.

packages/unit/test/widget/align_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/animated_container_test.dart

-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';

packages/unit/test/widget/block_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import '../engine/mock_events.dart';

packages/unit/test/widget/box_decoration_test.dart

-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';

packages/unit/test/widget/build_scope_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/center_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/coordinates_test.dart

-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';

packages/unit/test/widget/date_picker_test.dart

-import 'package:sky/material.dart';
+import 'package:flutter/material.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/dismissable_test.dart

-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';

packages/unit/test/widget/draggable_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import '../engine/mock_events.dart';

packages/unit/test/widget/drawer_test.dart

-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';

packages/unit/test/widget/duplicate_key_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/flex_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/focus_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/fractionally_sized_box_test.dart

-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';

packages/unit/test/widget/gesture_detector_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import '../engine/mock_events.dart';

packages/unit/test/widget/homogeneous_viewport_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/input_test.dart

 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';

packages/unit/test/widget/listener_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/mixed_viewport_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/multichild_test.dart

-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';

packages/unit/test/widget/navigator_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/pageable_list_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/parent_data_test.dart

-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';

packages/unit/test/widget/progress_indicator_test.dart

 
-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';

packages/unit/test/widget/render_object_widget_test.dart

-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';

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';

packages/unit/test/widget/scrollable_list_hit_testing_test.dart

-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';

packages/unit/test/widget/scrollable_list_horizontal_test.dart

-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';

packages/unit/test/widget/scrollable_list_vertical_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

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';

packages/unit/test/widget/set_state_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import '../engine/mock_events.dart';

packages/unit/test/widget/shader_mask_test.dart

 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';

packages/unit/test/widget/size_observer_test.dart

 
-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';

packages/unit/test/widget/snack_bar_test.dart

-import 'package:sky/material.dart';
+import 'package:flutter/material.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

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';

packages/unit/test/widget/stack_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/stateful_component_test.dart

-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';

packages/unit/test/widget/stateful_components_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/syncing_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/test_widgets.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/transform_test.dart

-import 'package:sky/widgets.dart';
+import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/widget_tester.dart

 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';
 

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;

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'