Skip to content

Commit 546bdec

Browse files
authored
Fix implementation imports outside of lib (#143594)
Work towards https://github.com/dart-lang/linter/issues/4859 There are libraries outside a `lib/` directory, which violate `implementation_imports`. Supersedes flutter/flutter#143560.
1 parent 3a18473 commit 546bdec

File tree

13 files changed

+19
-16
lines changed

13 files changed

+19
-16
lines changed

dev/bots/prepare_package/archive_publisher.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import 'dart:convert';
66

7+
import 'package:convert/convert.dart';
78
import 'package:crypto/crypto.dart';
8-
import 'package:crypto/src/digest_sink.dart';
99
import 'package:file/file.dart';
1010
import 'package:path/path.dart' as path;
1111
import 'package:platform/platform.dart' show LocalPlatform, Platform;
@@ -49,15 +49,15 @@ class ArchivePublisher {
4949
static String getMetadataFilename(Platform platform) => 'releases_${platform.operatingSystem.toLowerCase()}.json';
5050

5151
Future<String> _getChecksum(File archiveFile) async {
52-
final DigestSink digestSink = DigestSink();
52+
final AccumulatorSink<Digest> digestSink = AccumulatorSink<Digest>();
5353
final ByteConversionSink sink = sha256.startChunkedConversion(digestSink);
5454

5555
final Stream<List<int>> stream = archiveFile.openRead();
5656
await stream.forEach((List<int> chunk) {
5757
sink.add(chunk);
5858
});
5959
sink.close();
60-
return digestSink.value.toString();
60+
return digestSink.events.single.toString();
6161
}
6262

6363
/// Publish the archive to Google Storage.

packages/flutter_driver/test/src/real_tests/stubs/stub_finder_extension.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/src/widgets/framework.dart';
5+
import 'package:flutter/widgets.dart';
66
import 'package:flutter_driver/driver_extension.dart';
77
import 'package:flutter_driver/src/common/find.dart';
8-
import 'package:flutter_test/src/finders.dart';
8+
import 'package:flutter_test/flutter_test.dart';
99

1010
import 'stub_finder.dart';
1111

packages/flutter_driver/test/src/web_tests/web_driver_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:flutter_driver/src/common/error.dart';
66
import 'package:flutter_driver/src/common/health.dart';
77
import 'package:flutter_driver/src/driver/web_driver.dart';
8-
import 'package:webdriver/src/common/log.dart';
8+
import 'package:webdriver/async_io.dart';
99

1010
import '../../common.dart';
1111

packages/flutter_test/test/widget_tester_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'package:flutter/scheduler.dart';
1414
import 'package:flutter/services.dart';
1515
import 'package:flutter_test/flutter_test.dart';
1616
import 'package:matcher/expect.dart' as matcher;
17-
import 'package:matcher/src/expect/async_matcher.dart';
17+
import 'package:matcher/src/expect/async_matcher.dart'; // ignore: implementation_imports
1818

1919
import 'multi_view_testing.dart';
2020

packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'dart:io' as io;
77
import 'dart:typed_data';
88

99
import 'package:fake_async/fake_async.dart';
10+
import 'package:file/file.dart';
1011
import 'package:file/memory.dart';
11-
import 'package:file/src/interface/file.dart';
1212
import 'package:flutter_tools/src/android/android_device.dart';
1313
import 'package:flutter_tools/src/android/android_workflow.dart';
1414
import 'package:flutter_tools/src/application_package.dart';

packages/flutter_tools/test/general.shard/coverage_collector_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:convert' show jsonEncode;
66
import 'dart:io' show Directory, File;
77

8-
import 'package:coverage/src/hitmap.dart';
8+
import 'package:coverage/coverage.dart' show HitMap;
99
import 'package:file/memory.dart';
1010
import 'package:flutter_tools/src/base/file_system.dart' show FileSystem;
1111
import 'package:flutter_tools/src/test/coverage_collector.dart';

packages/flutter_tools/test/general.shard/drive/web_driver_service_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:async';
66

7-
import 'package:file/src/interface/file_system.dart';
7+
import 'package:file/file.dart';
88
import 'package:flutter_tools/src/base/logger.dart';
99
import 'package:flutter_tools/src/base/net.dart';
1010
import 'package:flutter_tools/src/base/process.dart';

packages/flutter_tools/test/general.shard/isolated/fake_native_assets_build_runner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:file/src/interface/file_system.dart';
5+
import 'package:file/file.dart';
66
import 'package:flutter_tools/src/base/logger.dart';
77
import 'package:flutter_tools/src/isolated/native_assets/native_assets.dart';
88
import 'package:flutter_tools/src/resident_runner.dart';

packages/flutter_tools/test/general.shard/resident_runner_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ import 'package:flutter_tools/src/run_cold.dart';
3030
import 'package:flutter_tools/src/run_hot.dart';
3131
import 'package:flutter_tools/src/version.dart';
3232
import 'package:flutter_tools/src/vmservice.dart';
33-
import 'package:unified_analytics/src/enums.dart';
33+
// TODO(goderbauer): Fix this ignore when https://github.com/dart-lang/tools/issues/234 is resolved.
34+
import 'package:unified_analytics/src/enums.dart' show DashEvent; // ignore: implementation_imports
3435
import 'package:unified_analytics/unified_analytics.dart';
3536
import 'package:vm_service/vm_service.dart' as vm_service;
3637

packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import 'package:flutter_tools/src/project.dart';
2727
import 'package:flutter_tools/src/reporting/reporting.dart';
2828
import 'package:flutter_tools/src/runner/flutter_command.dart';
2929
import 'package:test/fake.dart';
30-
import 'package:unified_analytics/src/enums.dart';
30+
// TODO(goderbauer): Fix this ignore when https://github.com/dart-lang/tools/issues/234 is resolved.
31+
import 'package:unified_analytics/src/enums.dart' show DashEvent; // ignore: implementation_imports
3132
import 'package:unified_analytics/unified_analytics.dart';
3233

3334
import '../../src/common.dart';

packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9-
import 'package:dds/src/dap/logging.dart';
9+
import 'package:dds/dap.dart' show Logger;
1010
import 'package:flutter_tools/src/cache.dart';
1111
import 'package:flutter_tools/src/debug_adapters/server.dart';
1212
import 'package:flutter_tools/src/globals.dart' as globals;

packages/flutter_tools/test/integration.shard/deprecated_gradle_settings_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:file/src/interface/file.dart';
5+
import 'package:file/file.dart';
66
import 'package:file_testing/file_testing.dart';
77
import 'package:flutter_tools/src/base/io.dart';
88

packages/flutter_tools/test/src/common.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import 'package:meta/meta.dart';
1717
import 'package:path/path.dart' as path; // flutter_ignore: package_path_import
1818
import 'package:test/test.dart' as test_package show test;
1919
import 'package:test/test.dart' hide test;
20-
import 'package:unified_analytics/src/enums.dart';
20+
// TODO(goderbauer): Fix this ignore when https://github.com/dart-lang/tools/issues/234 is resolved.
21+
import 'package:unified_analytics/src/enums.dart' show DevicePlatform; // ignore: implementation_imports
2122
import 'package:unified_analytics/unified_analytics.dart';
2223

2324
import 'fakes.dart';

0 commit comments

Comments
 (0)