Stop exporting framework.dart from basic.dart, since we now have widgets.dart...

Stop exporting framework.dart from basic.dart, since we now have widgets.dart exporting all of framework.dart.

packages/flutter/lib/editing/editable_text.dart

@@ -9,6 +9,7 @@ import 'package:sky/editing/editable_string.dart';
 import 'package:sky/painting/text_style.dart';
 import 'package:sky/rendering/object.dart';
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 
 const _kCursorBlinkPeriod = 500; // milliseconds
 const _kCursorGap = 1.0;

packages/flutter/lib/widgets/animated_component.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/animation/animation_performance.dart';
-import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 
 abstract class AnimatedComponent extends StatefulComponent {
 

packages/flutter/lib/widgets/animated_container.dart

@@ -9,8 +9,9 @@ import 'package:sky/animation/animation_performance.dart';
 import 'package:sky/animation/curves.dart';
 import 'package:sky/base/lerp.dart';
 import 'package:sky/painting/box_painter.dart';
-import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/animated_component.dart';
+import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 
 class AnimatedBoxConstraintsValue extends AnimatedValue<BoxConstraints> {
   AnimatedBoxConstraintsValue(BoxConstraints begin, { BoxConstraints end, Curve curve: linear })

packages/flutter/lib/widgets/basic.dart

@@ -34,7 +34,6 @@ export 'package:sky/rendering/object.dart' show Point, Offset, Size, Rect, Color
 export 'package:sky/rendering/proxy_box.dart' show BackgroundImage, BoxDecoration, BoxDecorationPosition, BoxShadow, Border, BorderSide, EdgeDims, Shape;
 export 'package:sky/rendering/toggleable.dart' show ValueChanged;
 export 'package:sky/rendering/viewport.dart' show ScrollDirection;
-export 'package:sky/widgets/framework.dart' show Key, GlobalKey, Widget, Component, StatefulComponent, App, runApp, Listener, ParentDataNode;
 
 // PAINTING NODES
 

packages/flutter/lib/widgets/button_base.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/basic.dart';
+import 'package:sky/widgets/framework.dart';
 
 abstract class ButtonBase extends StatefulComponent {
 

packages/flutter/lib/widgets/card.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/material.dart';
 
 const EdgeDims kCardMargins = const EdgeDims.all(4.0);

packages/flutter/lib/widgets/date_picker.dart

@@ -4,12 +4,17 @@
 
 import 'dart:async';
 
+import 'package:intl/date_symbols.dart';
+import 'package:intl/intl.dart';
 import 'package:sky/mojo/activity.dart';
 import 'package:sky/theme/colors.dart' as colors;
 import 'package:sky/theme/typography.dart' as typography;
-import 'package:sky/widgets.dart';
-import 'package:intl/intl.dart';
-import 'package:intl/date_symbols.dart';
+import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
+import 'package:sky/widgets/gesture_detector.dart';
+import 'package:sky/widgets/ink_well.dart';
+import 'package:sky/widgets/scrollable.dart';
+import 'package:sky/widgets/theme.dart';
 
 typedef void DatePickerValueChanged(DateTime dateTime);
 

packages/flutter/lib/widgets/dialog.dart

@@ -10,6 +10,7 @@ import 'package:sky/theme/colors.dart' as colors;
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/default_text_style.dart';
 import 'package:sky/widgets/focus.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/material.dart';
 import 'package:sky/widgets/navigator.dart';

packages/flutter/lib/widgets/drawer.dart

@@ -11,6 +11,7 @@ import 'package:sky/animation/forces.dart';
 import 'package:sky/theme/colors.dart' as colors;
 import 'package:sky/theme/shadows.dart';
 import 'package:sky/widgets/animated_container.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/navigator.dart';

packages/flutter/lib/widgets/drawer_divider.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/theme.dart';
 
 class DrawerDivider extends Component {

packages/flutter/lib/widgets/drawer_header.dart

@@ -5,6 +5,7 @@
 import 'package:sky/theme/view_configuration.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/default_text_style.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/theme.dart';
 
 // TODO(jackson): This class should usually render the user's

packages/flutter/lib/widgets/flat_button.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/theme/colors.dart';
-import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/material_button.dart';
 import 'package:sky/widgets/theme.dart';
 

packages/flutter/lib/widgets/floating_action_button.dart

@@ -4,6 +4,7 @@
 
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/button_base.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/icon.dart';
 import 'package:sky/widgets/ink_well.dart';

packages/flutter/lib/widgets/material.dart

@@ -7,6 +7,7 @@ import 'package:sky/theme/shadows.dart';
 import 'package:sky/widgets/animated_container.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/default_text_style.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/theme.dart';
 
 enum MaterialType { canvas, card, circle, button }

packages/flutter/lib/widgets/material_button.dart

@@ -4,6 +4,7 @@
 
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/button_base.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/ink_well.dart';
 import 'package:sky/widgets/material.dart';

packages/flutter/lib/widgets/mimic.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 
 abstract class GlobalKeyWatcher extends StatefulComponent {
   GlobalKeyWatcher({

packages/flutter/lib/widgets/mimic_overlay.dart

@@ -7,6 +7,7 @@ import 'package:sky/animation/animation_performance.dart';
 import 'package:sky/animation/curves.dart';
 import 'package:sky/widgets/animated_component.dart';
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/mimic.dart';
 
 class MimicOverlay extends AnimatedComponent {

packages/flutter/lib/widgets/navigator.dart

@@ -7,6 +7,7 @@ import 'package:sky/animation/animation_performance.dart';
 import 'package:sky/animation/curves.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/focus.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/transitions.dart';
 
 typedef Widget RouteBuilder(Navigator navigator, RouteBase route);

packages/flutter/lib/widgets/popup_menu.dart

@@ -10,6 +10,7 @@ import 'package:sky/painting/box_painter.dart';
 import 'package:sky/theme/colors.dart';
 import 'package:sky/theme/shadows.dart';
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/navigator.dart';
 import 'package:sky/widgets/popup_menu_item.dart';
 import 'package:sky/widgets/scrollable.dart';

packages/flutter/lib/widgets/popup_menu_item.dart

@@ -5,6 +5,7 @@
 import 'package:sky/painting/text_style.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/default_text_style.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/ink_well.dart';
 import 'package:sky/widgets/theme.dart';

packages/flutter/lib/widgets/radio.dart

@@ -7,6 +7,7 @@ import 'dart:sky' as sky;
 import 'package:sky/rendering/object.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/button_base.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/theme.dart';
 

packages/flutter/lib/widgets/raised_button.dart

@@ -4,6 +4,7 @@
 
 import 'package:sky/theme/colors.dart' as colors;
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/material_button.dart';
 import 'package:sky/widgets/theme.dart';
 

packages/flutter/lib/widgets/snack_bar.dart

@@ -10,6 +10,7 @@ import 'package:sky/painting/text_style.dart';
 import 'package:sky/theme/typography.dart' as typography;
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/default_text_style.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/gesture_detector.dart';
 import 'package:sky/widgets/material.dart';
 import 'package:sky/widgets/theme.dart';

packages/flutter/lib/widgets/theme.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:sky/theme/theme_data.dart';
-import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/framework.dart';
 
 export 'package:sky/theme/theme_data.dart' show ThemeData, ThemeBrightness;

packages/flutter/lib/widgets/tool_bar.dart

@@ -11,6 +11,7 @@ import 'package:sky/theme/typography.dart' as typography;
 import 'package:sky/theme/view_configuration.dart';
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/default_text_style.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:sky/widgets/icon.dart';
 
 class ToolBar extends Component {

packages/flutter/lib/widgets/transitions.dart

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/widgets/animated_component.dart';
-import 'package:sky/animation/animation_performance.dart';
 import 'package:sky/animation/animated_value.dart';
+import 'package:sky/animation/animation_performance.dart';
+import 'package:sky/widgets/animated_component.dart';
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
 import 'package:vector_math/vector_math.dart';
 
 export 'package:sky/animation/direction.dart' show Direction;