Skip to content

Delete flutter/ directories that no longer serve a purpose. #2052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenzieschmoll merged 7 commits into from
Jun 8, 2020
Merged

Delete flutter/ directories that no longer serve a purpose. #2052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba957a9
Delete flutter/ directories that no longer serve a purpose.
kenzieschmoll Jun 8, 2020
45dc7d7
remove flutter folder from travis.sh
kenzieschmoll Jun 8, 2020
43cd329
sort imports
kenzieschmoll Jun 8, 2020
1536350
disable memory_service_test
kenzieschmoll Jun 8, 2020
7b191b2
move rendering_tester to support/
kenzieschmoll Jun 8, 2020
52dbe29
annotate with TestOn('vm')
kenzieschmoll Jun 8, 2020
2965f0c
skip integration tests completely
kenzieschmoll Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/devtools_app/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import 'package:flutter/material.dart';

import 'src/config_specific/flutter/framework_initialize/framework_initialize.dart';
import 'src/flutter/app.dart';
import 'src/app.dart';
import 'src/config_specific/framework_initialize/framework_initialize.dart';

void main() async {
await initializeFramework();
Expand Down
34 changes: 17 additions & 17 deletions ...ges/devtools_app/lib/src/flutter/app.dart → packages/devtools_app/lib/src/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ import 'package:flutter/material.dart';
import 'package:pedantic/pedantic.dart';
import 'package:provider/provider.dart';

import '../../devtools.dart' as devtools;
import '../debugger/flutter/debugger_controller.dart';
import '../debugger/flutter/debugger_screen.dart';
import '../framework/framework_core.dart';
import '../globals.dart';
import '../inspector/flutter/inspector_screen.dart';
import '../logging/flutter/logging_screen.dart';
import '../logging/logging_controller.dart';
import '../memory/flutter/memory_controller.dart';
import '../memory/flutter/memory_screen.dart';
import '../network/flutter/network_screen.dart';
import '../network/network_controller.dart';
import '../performance/flutter/performance_screen.dart';
import '../performance/performance_controller.dart';
import '../timeline/flutter/timeline_controller.dart';
import '../timeline/flutter/timeline_screen.dart';
import '../ui/flutter/service_extension_widgets.dart';
import '../devtools.dart' as devtools;
import 'common_widgets.dart';
import 'connect_screen.dart';
import 'debugger/debugger_controller.dart';
import 'debugger/debugger_screen.dart';
import 'framework/framework_core.dart';
import 'globals.dart';
import 'initializer.dart';
import 'inspector/inspector_screen.dart';
import 'logging/logging_controller.dart';
import 'logging/logging_screen.dart';
import 'memory/memory_controller.dart';
import 'memory/memory_screen.dart';
import 'network/network_controller.dart';
import 'network/network_screen.dart';
import 'notifications.dart';
import 'performance/performance_controller.dart';
import 'performance/performance_screen.dart';
import 'preferences.dart';
import 'scaffold.dart';
import 'screen.dart';
import 'snapshot_screen.dart';
import 'theme.dart';
import 'timeline/timeline_controller.dart';
import 'timeline/timeline_screen.dart';
import 'ui/service_extension_widgets.dart';
import 'utils.dart';

const homeRoute = '/';
Expand Down
2 changes: 1 addition & 1 deletion ...p/lib/src/flutter/auto_dispose_mixin.dart → ...tools_app/lib/src/auto_dispose_mixin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';

import 'package:flutter/widgets.dart';

import '../auto_dispose.dart';
import 'auto_dispose.dart';

/// Mixin to simplifying managing the lifetime of listeners used by a
/// [StatefulWidget].
Expand Down
2 changes: 1 addition & 1 deletion ..._app/lib/src/flutter/banner_messages.dart → ...devtools_app/lib/src/banner_messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import '../globals.dart';
import 'common_widgets.dart';
import 'globals.dart';
import 'screen.dart';
import 'theme.dart';
import 'utils.dart';
Expand Down
0 ...ib/src/flutter/blocking_action_mixin.dart → ...ls_app/lib/src/blocking_action_mixin.dart
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...p/lib/src/charts/flutter/flame_chart.dart → ...tools_app/lib/src/charts/flame_chart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

import '../../flutter/auto_dispose_mixin.dart';
import '../../flutter/common_widgets.dart';
import '../../flutter/extent_delegate_list.dart';
import '../../flutter/flutter_widgets/linked_scroll_controller.dart';
import '../../flutter/theme.dart';
import '../../ui/colors.dart';
import '../../utils.dart';
import '../auto_dispose_mixin.dart';
import '../common_widgets.dart';
import '../extent_delegate_list.dart';
import '../flutter_widgets/linked_scroll_controller.dart';
import '../theme.dart';
import '../ui/colors.dart';
import '../utils.dart';

const double rowPadding = 2.0;
const double rowHeight = 25.0;
Expand Down
0 ...pp/lib/src/flutter/collapsible_mixin.dart → ...vtools_app/lib/src/collapsible_mixin.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s_app/lib/src/flutter/common_widgets.dart → .../devtools_app/lib/src/common_widgets.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';

import '../ui/flutter/label.dart';
import 'scaffold.dart';
import 'theme.dart';
import 'ui/label.dart';

const tooltipWait = Duration(milliseconds: 500);

Expand Down
0 ...drag_and_drop/_drag_and_drop_desktop.dart → ...drag_and_drop/_drag_and_drop_desktop.dart
View file
Open in desktop
File renamed without changes.
0 ...er/drag_and_drop/_drag_and_drop_stub.dart → ...ic/drag_and_drop/_drag_and_drop_stub.dart
View file
Open in desktop
File renamed without changes.
0 ...ter/drag_and_drop/_drag_and_drop_web.dart → ...fic/drag_and_drop/_drag_and_drop_web.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../flutter/drag_and_drop/drag_and_drop.dart → ...specific/drag_and_drop/drag_and_drop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'package:flutter/material.dart';

import '../../../flutter/notifications.dart';
import '../../notifications.dart';
import '_drag_and_drop_stub.dart'
if (dart.library.html) '_drag_and_drop_web.dart'
if (dart.library.io) '_drag_and_drop_desktop.dart';
Expand Down
6 changes: 3 additions & 3 deletions ...ialize/_framework_initialize_desktop.dart → ...ialize/_framework_initialize_desktop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:path/path.dart' as path;

import '../../../globals.dart';
import '../../../storage.dart';
import '../../logger/logger.dart';
import '../../globals.dart';
import '../../storage.dart';
import '../logger/logger.dart';

/// Return the url the application is launched from.
Future<String> initializePlatform() async {
Expand Down
0 ...nitialize/_framework_initialize_stub.dart → ...nitialize/_framework_initialize_stub.dart
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...initialize/_framework_initialize_web.dart → ...initialize/_framework_initialize_web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import 'dart:html' hide Storage;

import '../../../globals.dart';
import '../../../server_api_client.dart';
import '../../../storage.dart';
import '../../globals.dart';
import '../../server_api_client.dart';
import '../../storage.dart';

/// Return the url the application is launched from.
Future<String> initializePlatform() async {
Expand Down
2 changes: 1 addition & 1 deletion ...work_initialize/framework_initialize.dart → ...work_initialize/framework_initialize.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../../../framework/framework_core.dart';
import '../../framework/framework_core.dart';
import '_framework_initialize_stub.dart'
if (dart.library.html) '_framework_initialize_web.dart'
if (dart.library.io) '_framework_initialize_desktop.dart';
Expand Down
2 changes: 1 addition & 1 deletion ...lutter/import_export/_export_desktop.dart → ...ecific/import_export/_export_desktop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../../file/file.dart';
import '../file/file.dart';
import 'import_export.dart';

ExportControllerDesktop createExportController() {
Expand Down
0 ...c/flutter/import_export/_export_stub.dart → ..._specific/import_export/_export_stub.dart
View file
Open in desktop
File renamed without changes.
0 ...ic/flutter/import_export/_export_web.dart → ...g_specific/import_export/_export_web.dart
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions .../flutter/import_export/import_export.dart → ...specific/import_export/import_export.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

import 'dart:convert';

import '../../../../devtools.dart';
import '../../../flutter/notifications.dart';
import '../../../globals.dart';
import '../../../timeline/flutter/timeline_model.dart';
import '../../../timeline/flutter/timeline_screen.dart';
import '../../../devtools.dart';
import '../../globals.dart';
import '../../notifications.dart';
import '../../timeline/timeline_model.dart';
import '../../timeline/timeline_screen.dart';
import '_export_stub.dart'
if (dart.library.html) '_export_web.dart'
if (dart.library.io) '_export_desktop.dart';
Expand Down
8 changes: 4 additions & 4 deletions ...s_app/lib/src/flutter/connect_screen.dart → .../devtools_app/lib/src/connect_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:pedantic/pedantic.dart';

import '../../src/framework/framework_core.dart';
import '../globals.dart';
import '../url_utils.dart';
import '../utils.dart';
import 'common_widgets.dart';
import 'framework/framework_core.dart';
import 'globals.dart';
import 'navigation.dart';
import 'notifications.dart';
import 'theme.dart';
import 'url_utils.dart';
import 'utils.dart';

/// The screen in the app responsible for connecting to the Dart VM.
///
Expand Down
2 changes: 1 addition & 1 deletion ...devtools_app/lib/src/flutter/console.dart → packages/devtools_app/lib/src/console.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

import '../debugger/flutter/codeview.dart';
import 'common_widgets.dart';
import 'debugger/codeview.dart';
import 'theme.dart';
import 'utils.dart';

Expand Down
0 ...c/flutter/custom_pointer_scroll_view.dart → ...p/lib/src/custom_pointer_scroll_view.dart
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...lib/src/debugger/flutter/breakpoints.dart → ...ols_app/lib/src/debugger/breakpoints.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import '../../flutter/common_widgets.dart';
import '../../flutter/theme.dart';
import '../../utils.dart';
import '../common_widgets.dart';
import '../theme.dart';
import '../utils.dart';
import 'common.dart';
import 'debugger_controller.dart';
import 'debugger_model.dart';
Expand Down
6 changes: 3 additions & 3 deletions .../lib/src/debugger/flutter/call_stack.dart → ...ools_app/lib/src/debugger/call_stack.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'package:flutter/material.dart' hide Stack;
import 'package:provider/provider.dart';
import 'package:vm_service/vm_service.dart';

import '../../flutter/common_widgets.dart';
import '../../flutter/theme.dart';
import '../../utils.dart';
import '../common_widgets.dart';
import '../theme.dart';
import '../utils.dart';
import 'debugger_controller.dart';
import 'debugger_model.dart';

Expand Down
12 changes: 6 additions & 6 deletions ...pp/lib/src/debugger/flutter/codeview.dart → ...vtools_app/lib/src/debugger/codeview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:vm_service/vm_service.dart' hide Stack;

import '../../config_specific/logger/logger.dart';
import '../../flutter/auto_dispose_mixin.dart';
import '../../flutter/common_widgets.dart';
import '../../flutter/flutter_widgets/linked_scroll_controller.dart';
import '../../flutter/theme.dart';
import '../../utils.dart';
import '../auto_dispose_mixin.dart';
import '../common_widgets.dart';
import '../config_specific/logger/logger.dart';
import '../flutter_widgets/linked_scroll_controller.dart';
import '../theme.dart';
import '../utils.dart';
import 'breakpoints.dart';
import 'common.dart';
import 'debugger_controller.dart';
Expand Down
2 changes: 1 addition & 1 deletion ..._app/lib/src/debugger/flutter/common.dart → ...devtools_app/lib/src/debugger/common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'package:flutter/material.dart';

import '../../flutter/theme.dart';
import '../theme.dart';
import 'debugger_screen.dart';

/// Create a header area for a debugger component.
Expand Down
6 changes: 3 additions & 3 deletions ...app/lib/src/debugger/flutter/console.dart → ...evtools_app/lib/src/debugger/console.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

import '../../flutter/common_widgets.dart';
import '../../flutter/console.dart';
import '../../utils.dart';
import '../common_widgets.dart';
import '../console.dart';
import '../utils.dart';
import 'common.dart';
import 'debugger_controller.dart';

Expand Down
6 changes: 3 additions & 3 deletions ...pp/lib/src/debugger/flutter/controls.dart → ...vtools_app/lib/src/debugger/controls.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import 'package:flutter/material.dart' hide Stack;
import 'package:vm_service/vm_service.dart';

import '../../flutter/common_widgets.dart';
import '../../flutter/theme.dart';
import '../../ui/flutter/label.dart';
import '../common_widgets.dart';
import '../theme.dart';
import '../ui/label.dart';
import 'debugger_controller.dart';
import 'scripts.dart';

Expand Down
8 changes: 4 additions & 4 deletions ...debugger/flutter/debugger_controller.dart → ...lib/src/debugger/debugger_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import 'package:flutter/material.dart' hide Stack;
import 'package:pedantic/pedantic.dart';
import 'package:vm_service/vm_service.dart';

import '../../auto_dispose.dart';
import '../../core/message_bus.dart';
import '../../globals.dart';
import '../../utils.dart';
import '../auto_dispose.dart';
import '../core/message_bus.dart';
import '../globals.dart';
import '../utils.dart';
import 'debugger_model.dart';

// TODO(devoncarew): Add some delayed resume value notifiers (to be used to
Expand Down
4 changes: 2 additions & 2 deletions .../src/debugger/flutter/debugger_model.dart → ..._app/lib/src/debugger/debugger_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart' hide Stack;
import 'package:vm_service/vm_service.dart';

import '../../trees.dart';
import '../../utils.dart';
import '../trees.dart';
import '../utils.dart';

/// A tuple of a script and an optional location.
class ScriptLocation {
Expand Down
18 changes: 9 additions & 9 deletions ...src/debugger/flutter/debugger_screen.dart → ...app/lib/src/debugger/debugger_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:vm_service/vm_service.dart';

import '../../config_specific/host_platform/host_platform.dart';
import '../../flutter/auto_dispose_mixin.dart';
import '../../flutter/common_widgets.dart';
import '../../flutter/flex_split_column.dart';
import '../../flutter/octicons.dart';
import '../../flutter/screen.dart';
import '../../flutter/split.dart';
import '../../flutter/theme.dart';
import '../../globals.dart';
import '../auto_dispose_mixin.dart';
import '../common_widgets.dart';
import '../config_specific/host_platform/host_platform.dart';
import '../flex_split_column.dart';
import '../globals.dart';
import '../octicons.dart';
import '../screen.dart';
import '../split.dart';
import '../theme.dart';
import 'breakpoints.dart';
import 'call_stack.dart';
import 'codeview.dart';
Expand Down
2 changes: 1 addition & 1 deletion ...rc/debugger/flutter/debugger_service.dart → ...pp/lib/src/debugger/debugger_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:vm_service/vm_service.dart';

import '../../globals.dart';
import '../globals.dart';

class DebuggerService {
Stream<Event> get onDebugEvent => serviceManager.service.onDebugEvent;
Expand Down
9 changes: 4 additions & 5 deletions ...app/lib/src/debugger/flutter/scripts.dart → ...evtools_app/lib/src/debugger/scripts.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
import 'package:flutter/material.dart';
import 'package:vm_service/vm_service.dart';

import '../../config_specific/host_platform/host_platform.dart';
import '../../flutter/common_widgets.dart';
import '../../flutter/theme.dart';
import '../../flutter/utils.dart';
import '../../utils.dart';
import '../common_widgets.dart';
import '../config_specific/host_platform/host_platform.dart';
import '../theme.dart';
import '../utils.dart';
import 'debugger_controller.dart';
import 'debugger_model.dart';
import 'debugger_screen.dart';
Expand Down
4 changes: 2 additions & 2 deletions ...p/lib/src/debugger/flutter/variables.dart → ...tools_app/lib/src/debugger/variables.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import 'package:flutter/material.dart' hide Stack;
import 'package:provider/provider.dart';

import '../../flutter/common_widgets.dart';
import '../../flutter/tree.dart';
import '../common_widgets.dart';
import '../tree.dart';
import 'debugger_controller.dart';
import 'debugger_model.dart';

Expand Down
12 changes: 6 additions & 6 deletions ...ls_app/lib/src/flutter/device_dialog.dart → ...s/devtools_app/lib/src/device_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import 'package:meta/meta.dart';
import 'package:pedantic/pedantic.dart';
import 'package:vm_service/vm_service.dart';

import '../connected_app.dart';
import '../globals.dart';
import '../info/info_controller.dart';
import '../table_data.dart';
import '../utils.dart';
import '../version.dart';
import 'auto_dispose_mixin.dart';
import 'common_widgets.dart';
import 'connected_app.dart';
import 'globals.dart';
import 'info/info_controller.dart';
import 'table.dart';
import 'table_data.dart';
import 'theme.dart';
import 'utils.dart';
import 'version.dart';

class DeviceDialog extends StatelessWidget {
const DeviceDialog({
Expand Down
Loading