diff --git a/pkgs/file/lib/src/backends/chroot.dart b/pkgs/file/lib/src/backends/chroot.dart index 2dd70436d..402dbec5b 100644 --- a/pkgs/file/lib/src/backends/chroot.dart +++ b/pkgs/file/lib/src/backends/chroot.dart @@ -7,8 +7,9 @@ import 'dart:typed_data'; import 'package:path/path.dart' as p; -import '../../file.dart'; import '../common.dart' as common; +import '../forwarding.dart'; +import '../interface.dart'; import '../io.dart' as io; part 'chroot/chroot_directory.dart'; diff --git a/pkgs/file/lib/src/backends/local/local_directory.dart b/pkgs/file/lib/src/backends/local/local_directory.dart index d7c3e88e9..3e1db6140 100644 --- a/pkgs/file/lib/src/backends/local/local_directory.dart +++ b/pkgs/file/lib/src/backends/local/local_directory.dart @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../../file.dart'; import '../../common.dart' as common; +import '../../forwarding.dart'; +import '../../interface.dart'; import '../../io.dart' as io; - import 'local_file_system_entity.dart'; /// [Directory] implementation that forwards all calls to `dart:io`. diff --git a/pkgs/file/lib/src/backends/local/local_file.dart b/pkgs/file/lib/src/backends/local/local_file.dart index 78881aad1..a4bc10627 100644 --- a/pkgs/file/lib/src/backends/local/local_file.dart +++ b/pkgs/file/lib/src/backends/local/local_file.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../../file.dart'; +import '../../forwarding.dart'; +import '../../interface.dart'; import '../../io.dart' as io; - import 'local_file_system_entity.dart'; /// [File] implementation that forwards all calls to `dart:io`. diff --git a/pkgs/file/lib/src/backends/local/local_file_system.dart b/pkgs/file/lib/src/backends/local/local_file_system.dart index bf8812789..7541c370f 100644 --- a/pkgs/file/lib/src/backends/local/local_file_system.dart +++ b/pkgs/file/lib/src/backends/local/local_file_system.dart @@ -4,7 +4,7 @@ import 'package:path/path.dart' as p; -import '../../../file.dart'; +import '../../interface.dart'; import '../../io.dart' as io; import 'local_directory.dart'; import 'local_file.dart'; diff --git a/pkgs/file/lib/src/backends/local/local_file_system_entity.dart b/pkgs/file/lib/src/backends/local/local_file_system_entity.dart index 1e9301813..d0da55975 100644 --- a/pkgs/file/lib/src/backends/local/local_file_system_entity.dart +++ b/pkgs/file/lib/src/backends/local/local_file_system_entity.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../../file.dart'; +import '../../forwarding.dart'; +import '../../interface.dart'; import '../../io.dart' as io; - import 'local_directory.dart'; import 'local_file.dart'; import 'local_link.dart'; diff --git a/pkgs/file/lib/src/backends/local/local_link.dart b/pkgs/file/lib/src/backends/local/local_link.dart index a97f32015..2ce479165 100644 --- a/pkgs/file/lib/src/backends/local/local_link.dart +++ b/pkgs/file/lib/src/backends/local/local_link.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../../file.dart'; +import '../../forwarding.dart'; +import '../../interface.dart'; import '../../io.dart' as io; - import 'local_file_system_entity.dart'; /// [Link] implementation that forwards all calls to `dart:io`. diff --git a/pkgs/file/lib/src/backends/memory/memory_directory.dart b/pkgs/file/lib/src/backends/memory/memory_directory.dart index ca5dff01d..e73b96706 100644 --- a/pkgs/file/lib/src/backends/memory/memory_directory.dart +++ b/pkgs/file/lib/src/backends/memory/memory_directory.dart @@ -4,8 +4,8 @@ import 'package:meta/meta.dart'; -import '../../../file.dart'; import '../../common.dart' as common; +import '../../interface.dart'; import '../../io.dart' as io; import 'common.dart'; import 'memory_file.dart'; diff --git a/pkgs/file/lib/src/backends/memory/memory_file.dart b/pkgs/file/lib/src/backends/memory/memory_file.dart index d80a11ef5..1a8f5f972 100644 --- a/pkgs/file/lib/src/backends/memory/memory_file.dart +++ b/pkgs/file/lib/src/backends/memory/memory_file.dart @@ -9,8 +9,8 @@ import 'dart:typed_data'; import 'package:meta/meta.dart'; -import '../../../file.dart'; import '../../common.dart' as common; +import '../../interface.dart'; import '../../io.dart' as io; import 'common.dart'; import 'memory_file_system_entity.dart'; diff --git a/pkgs/file/lib/src/backends/memory/memory_file_system.dart b/pkgs/file/lib/src/backends/memory/memory_file_system.dart index 86c469d75..dd359f049 100644 --- a/pkgs/file/lib/src/backends/memory/memory_file_system.dart +++ b/pkgs/file/lib/src/backends/memory/memory_file_system.dart @@ -4,7 +4,7 @@ import 'package:path/path.dart' as p; -import '../../../file.dart'; +import '../../interface.dart'; import '../../io.dart' as io; import 'clock.dart'; import 'common.dart'; diff --git a/pkgs/file/lib/src/backends/memory/memory_file_system_entity.dart b/pkgs/file/lib/src/backends/memory/memory_file_system_entity.dart index 3d455ef05..1990abcd0 100644 --- a/pkgs/file/lib/src/backends/memory/memory_file_system_entity.dart +++ b/pkgs/file/lib/src/backends/memory/memory_file_system_entity.dart @@ -4,8 +4,8 @@ import 'package:meta/meta.dart'; -import '../../../file.dart'; import '../../common.dart' as common; +import '../../interface.dart'; import '../../io.dart' as io; import 'common.dart'; import 'memory_directory.dart'; diff --git a/pkgs/file/lib/src/backends/memory/memory_link.dart b/pkgs/file/lib/src/backends/memory/memory_link.dart index ff54a6359..a599fe8f1 100644 --- a/pkgs/file/lib/src/backends/memory/memory_link.dart +++ b/pkgs/file/lib/src/backends/memory/memory_link.dart @@ -4,8 +4,8 @@ import 'package:meta/meta.dart'; -import '../../../file.dart'; import '../../common.dart' as common; +import '../../interface.dart'; import '../../io.dart' as io; import 'memory_file_system_entity.dart'; import 'node.dart'; diff --git a/pkgs/file/lib/src/backends/memory/memory_random_access_file.dart b/pkgs/file/lib/src/backends/memory/memory_random_access_file.dart index 623a37984..190f0a137 100644 --- a/pkgs/file/lib/src/backends/memory/memory_random_access_file.dart +++ b/pkgs/file/lib/src/backends/memory/memory_random_access_file.dart @@ -6,7 +6,6 @@ import 'dart:convert'; import 'dart:math' as math show min; import 'dart:typed_data'; -import '../../../memory.dart' show MemoryFileSystem; import '../../common.dart' as common; import '../../io.dart' as io; import '../memory.dart' show MemoryFileSystem; diff --git a/pkgs/file/lib/src/backends/memory/node.dart b/pkgs/file/lib/src/backends/memory/node.dart index 88c7fcca7..eea72b58c 100644 --- a/pkgs/file/lib/src/backends/memory/node.dart +++ b/pkgs/file/lib/src/backends/memory/node.dart @@ -4,7 +4,7 @@ import 'dart:typed_data'; -import '../../../file.dart'; +import '../../interface.dart'; import '../../io.dart' as io; import 'clock.dart'; import 'common.dart'; diff --git a/pkgs/file/lib/src/backends/memory/style.dart b/pkgs/file/lib/src/backends/memory/style.dart index d64b31b4a..f4bd33fb7 100644 --- a/pkgs/file/lib/src/backends/memory/style.dart +++ b/pkgs/file/lib/src/backends/memory/style.dart @@ -4,7 +4,7 @@ import 'package:path/path.dart' as p; -import '../../../file.dart'; +import '../../interface.dart'; /// Class that represents the path style that a memory file system should /// adopt. diff --git a/pkgs/file/lib/src/backends/memory/utils.dart b/pkgs/file/lib/src/backends/memory/utils.dart index ae0fa14cd..aa24cfb57 100644 --- a/pkgs/file/lib/src/backends/memory/utils.dart +++ b/pkgs/file/lib/src/backends/memory/utils.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../../file.dart'; import '../../common.dart' as common; +import '../../interface.dart'; import '../../io.dart' as io; import 'common.dart'; import 'node.dart'; diff --git a/pkgs/file/lib/src/forwarding/forwarding_directory.dart b/pkgs/file/lib/src/forwarding/forwarding_directory.dart index d42c38153..ad1c548c1 100644 --- a/pkgs/file/lib/src/forwarding/forwarding_directory.dart +++ b/pkgs/file/lib/src/forwarding/forwarding_directory.dart @@ -2,7 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../file.dart'; +import '../forwarding.dart'; +import '../interface.dart'; import '../io.dart' as io; /// A directory that forwards all methods and properties to a delegate. diff --git a/pkgs/file/lib/src/forwarding/forwarding_file.dart b/pkgs/file/lib/src/forwarding/forwarding_file.dart index deaa2d083..d6cfe3bb7 100644 --- a/pkgs/file/lib/src/forwarding/forwarding_file.dart +++ b/pkgs/file/lib/src/forwarding/forwarding_file.dart @@ -5,7 +5,8 @@ import 'dart:convert'; import 'dart:typed_data'; -import '../../file.dart'; +import '../forwarding.dart'; +import '../interface.dart'; import '../io.dart' as io; /// A file that forwards all methods and properties to a delegate. diff --git a/pkgs/file/lib/src/forwarding/forwarding_file_system.dart b/pkgs/file/lib/src/forwarding/forwarding_file_system.dart index b49dafefb..885fdb618 100644 --- a/pkgs/file/lib/src/forwarding/forwarding_file_system.dart +++ b/pkgs/file/lib/src/forwarding/forwarding_file_system.dart @@ -5,7 +5,7 @@ import 'package:meta/meta.dart'; import 'package:path/path.dart' as p; -import '../../file.dart'; +import '../interface.dart'; import '../io.dart' as io; /// A file system that forwards all methods and properties to a delegate. diff --git a/pkgs/file/lib/src/forwarding/forwarding_file_system_entity.dart b/pkgs/file/lib/src/forwarding/forwarding_file_system_entity.dart index 33b5dd930..1c0628ee4 100644 --- a/pkgs/file/lib/src/forwarding/forwarding_file_system_entity.dart +++ b/pkgs/file/lib/src/forwarding/forwarding_file_system_entity.dart @@ -4,7 +4,7 @@ import 'package:meta/meta.dart'; -import '../../file.dart'; +import '../interface.dart'; import '../io.dart' as io; /// A file system entity that forwards all methods and properties to a delegate. diff --git a/pkgs/file/lib/src/forwarding/forwarding_link.dart b/pkgs/file/lib/src/forwarding/forwarding_link.dart index 29dde2748..915e710cf 100644 --- a/pkgs/file/lib/src/forwarding/forwarding_link.dart +++ b/pkgs/file/lib/src/forwarding/forwarding_link.dart @@ -2,7 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import '../../file.dart'; +import '../forwarding.dart'; +import '../interface.dart'; import '../io.dart' as io; /// A link that forwards all methods and properties to a delegate.