Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit ded5528

Browse files
Enable prefer_relative_imports (#6501)
1 parent f75cfb4 commit ded5528

File tree

126 files changed

+259
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+259
-143
lines changed

analysis_options.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ linter:
193193
# - prefer_mixin # Has false positives, see https://github.com/dart-lang/linter/issues/3018
194194
# - prefer_null_aware_method_calls # "call()" is confusing to people new to the language since it's not documented anywhere
195195
- prefer_null_aware_operators
196-
# - prefer_relative_imports # LOCAL CHANGE - Needs to be enabled and violations fixed.
196+
- prefer_relative_imports
197197
- prefer_single_quotes
198198
- prefer_spread_collections
199199
- prefer_typing_uninitialized_variables

packages/camera/camera/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 0.10.0+2
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45

56
## 0.10.0+1

packages/camera/camera/lib/src/camera_controller.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import 'dart:async';
66
import 'dart:math';
77

8-
import 'package:camera/camera.dart';
98
import 'package:camera_platform_interface/camera_platform_interface.dart';
109
import 'package:flutter/foundation.dart';
1110
import 'package:flutter/material.dart';
1211
import 'package:flutter/services.dart';
1312
import 'package:quiver/core.dart';
1413

14+
import '../camera.dart';
15+
1516
/// Signature for a callback receiving the a camera image.
1617
///
1718
/// This is used by [CameraController.startImageStream].

packages/camera/camera/lib/src/camera_preview.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
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:camera/camera.dart';
65
import 'package:flutter/foundation.dart';
76
import 'package:flutter/material.dart';
87
import 'package:flutter/services.dart';
98

9+
import '../camera.dart';
10+
1011
/// A widget showing a live camera preview.
1112
class CameraPreview extends StatelessWidget {
1213
/// Creates a preview widget for the given camera controller.

packages/camera/camera/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
44
Dart.
55
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
7-
version: 0.10.0+1
7+
version: 0.10.0+2
88

99
environment:
1010
sdk: ">=2.14.0 <3.0.0"

packages/camera/camera_platform_interface/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 2.2.1
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45
* Fixes avoid_redundant_argument_values lint warnings and minor typos.
56
* Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/104231).

packages/camera/camera_platform_interface/lib/src/events/device_event.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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:camera_platform_interface/src/utils/utils.dart';
65
import 'package:flutter/foundation.dart' show immutable;
76
import 'package:flutter/services.dart';
87

8+
import '../utils/utils.dart';
9+
910
/// Generic Event coming from the native side of Camera,
1011
/// not related to a specific camera module.
1112
///

packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import 'dart:async';
66
import 'dart:math';
77

8-
import 'package:camera_platform_interface/camera_platform_interface.dart';
9-
import 'package:camera_platform_interface/src/utils/utils.dart';
108
import 'package:flutter/foundation.dart';
119
import 'package:flutter/services.dart';
1210
import 'package:flutter/widgets.dart';
1311
import 'package:stream_transform/stream_transform.dart';
1412

13+
import '../../camera_platform_interface.dart';
14+
import '../utils/utils.dart';
1515
import 'type_conversion.dart';
1616

1717
const MethodChannel _channel = MethodChannel('plugins.flutter.io/camera');

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import 'dart:async';
66
import 'dart:math';
77

8-
import 'package:camera_platform_interface/camera_platform_interface.dart';
9-
import 'package:camera_platform_interface/src/method_channel/method_channel_camera.dart';
108
import 'package:flutter/services.dart';
119
import 'package:flutter/widgets.dart';
1210
import 'package:plugin_platform_interface/plugin_platform_interface.dart';
1311

12+
import '../../camera_platform_interface.dart';
13+
import '../method_channel/method_channel_camera.dart';
14+
1415
/// The interface that implementations of camera must implement.
1516
///
1617
/// Platform implementations should extend this class rather than implement it as `camera`

packages/camera/camera_platform_interface/lib/src/utils/utils.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +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:camera_platform_interface/camera_platform_interface.dart';
65
import 'package:flutter/services.dart';
76

7+
import '../../camera_platform_interface.dart';
8+
89
/// Parses a string into a corresponding CameraLensDirection.
910
CameraLensDirection parseCameraLensDirection(String string) {
1011
switch (string) {

packages/camera/camera_platform_interface/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
55
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
66
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
7-
version: 2.2.0
7+
version: 2.2.1
88

99
environment:
1010
sdk: '>=2.12.0 <3.0.0'

packages/camera/camera_web/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 0.3.0+1
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45
* Fixes avoid_redundant_argument_values lint warnings and minor typos.
56
* Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/106316).

packages/camera/camera_web/lib/src/camera.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import 'dart:html' as html;
77
import 'dart:ui';
88

99
import 'package:camera_platform_interface/camera_platform_interface.dart';
10-
import 'package:camera_web/src/camera_service.dart';
11-
import 'package:camera_web/src/types/types.dart';
1210
import 'package:flutter/foundation.dart';
1311

12+
import 'camera_service.dart';
1413
import 'shims/dart_ui.dart' as ui;
14+
import 'types/types.dart';
1515

1616
String _getViewType(int cameraId) => 'plugins.flutter.io/camera_$cameraId';
1717

packages/camera/camera_web/lib/src/camera_service.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import 'dart:html' as html;
88
import 'dart:ui';
99

1010
import 'package:camera_platform_interface/camera_platform_interface.dart';
11-
import 'package:camera_web/src/camera.dart';
12-
import 'package:camera_web/src/shims/dart_js_util.dart';
13-
import 'package:camera_web/src/types/types.dart';
1411
import 'package:flutter/foundation.dart';
1512
import 'package:flutter/services.dart';
1613

14+
import 'camera.dart';
15+
import 'shims/dart_js_util.dart';
16+
import 'types/types.dart';
17+
1718
/// A service to fetch, map camera settings and
1819
/// obtain the camera stream.
1920
class CameraService {

packages/camera/camera_web/lib/src/camera_web.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import 'dart:html' as html;
77
import 'dart:math';
88

99
import 'package:camera_platform_interface/camera_platform_interface.dart';
10-
import 'package:camera_web/src/camera.dart';
11-
import 'package:camera_web/src/camera_service.dart';
12-
import 'package:camera_web/src/types/types.dart';
1310
import 'package:flutter/material.dart';
1411
import 'package:flutter/services.dart';
1512
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
1613
import 'package:stream_transform/stream_transform.dart';
1714

15+
import 'camera.dart';
16+
import 'camera_service.dart';
17+
import 'types/types.dart';
18+
1819
// The default error message, when the error is an empty string.
1920
// See: https://developer.mozilla.org/en-US/docs/Web/API/MediaError/message
2021
const String _kDefaultErrorMessage =

packages/camera/camera_web/lib/src/types/camera_web_exception.dart

+1-1
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:camera_web/src/types/types.dart';
5+
import 'types.dart';
66

77
/// An exception thrown when the camera with id [cameraId] reports
88
/// an initialization, configuration or video streaming error,

packages/camera/camera_web/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera_web
22
description: A Flutter plugin for getting information about and controlling the camera on Web.
33
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_web
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.3.0
5+
version: 0.3.0+1
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/file_selector/file_selector_macos/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 0.9.0+2
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45

56
## 0.9.0+1

packages/file_selector/file_selector_macos/example/lib/main.dart

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
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:example/get_directory_page.dart';
6-
import 'package:example/home_page.dart';
7-
import 'package:example/open_image_page.dart';
8-
import 'package:example/open_multiple_images_page.dart';
9-
import 'package:example/open_text_page.dart';
10-
import 'package:example/save_text_page.dart';
115
import 'package:flutter/material.dart';
126

7+
import 'get_directory_page.dart';
8+
import 'home_page.dart';
9+
import 'open_image_page.dart';
10+
import 'open_multiple_images_page.dart';
11+
import 'open_text_page.dart';
12+
import 'save_text_page.dart';
13+
1314
void main() {
1415
runApp(const MyApp());
1516
}

packages/file_selector/file_selector_macos/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: file_selector_macos
22
description: macOS implementation of the file_selector plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_macos
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
5-
version: 0.9.0+1
5+
version: 0.9.0+2
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/file_selector/file_selector_platform_interface/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 2.1.1
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45

56
## 2.1.0

packages/file_selector/file_selector_platform_interface/lib/src/method_channel/method_channel_file_selector.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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_selector_platform_interface/file_selector_platform_interface.dart';
65
import 'package:flutter/foundation.dart' show visibleForTesting;
76
import 'package:flutter/services.dart';
87

8+
import '../../file_selector_platform_interface.dart';
9+
910
const MethodChannel _channel =
1011
MethodChannel('plugins.flutter.io/file_selector');
1112

packages/file_selector/file_selector_platform_interface/lib/src/platform_interface/file_selector_interface.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import 'dart:async';
66

7-
import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';
87
import 'package:plugin_platform_interface/plugin_platform_interface.dart';
98

9+
import '../../file_selector_platform_interface.dart';
1010
import '../method_channel/method_channel_file_selector.dart';
1111

1212
/// The interface that implementations of file_selector must implement.

packages/file_selector/file_selector_platform_interface/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
55
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
66
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
7-
version: 2.1.0
7+
version: 2.1.1
88

99
environment:
1010
sdk: ">=2.12.0 <3.0.0"

packages/file_selector/file_selector_web/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 0.9.0+1
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45
* Fixes avoid_redundant_argument_values lint warnings and minor typos.
56

packages/file_selector/file_selector_web/lib/file_selector_web.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import 'dart:async';
66

77
import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';
8-
import 'package:file_selector_web/src/dom_helper.dart';
9-
import 'package:file_selector_web/src/utils.dart';
108
import 'package:flutter/foundation.dart' show visibleForTesting;
119
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
1210

11+
import 'src/dom_helper.dart';
12+
import 'src/utils.dart';
13+
1314
/// The web implementation of [FileSelectorPlatform].
1415
///
1516
/// This class implements the `package:file_selector` functionality for the web.

packages/file_selector/file_selector_web/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: file_selector_web
22
description: Web platform implementation of file_selector
33
repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_web
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
5-
version: 0.9.0
5+
version: 0.9.0+1
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/file_selector/file_selector_windows/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 0.9.1+3
22

3+
* Updates imports for `prefer_relative_imports`.
34
* Updates minimum Flutter version to 2.10.
45

56
## 0.9.1+2

packages/file_selector/file_selector_windows/example/lib/main.dart

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
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:example/get_directory_page.dart';
6-
import 'package:example/home_page.dart';
7-
import 'package:example/open_image_page.dart';
8-
import 'package:example/open_multiple_images_page.dart';
9-
import 'package:example/open_text_page.dart';
10-
import 'package:example/save_text_page.dart';
115
import 'package:flutter/material.dart';
126

7+
import 'get_directory_page.dart';
8+
import 'home_page.dart';
9+
import 'open_image_page.dart';
10+
import 'open_multiple_images_page.dart';
11+
import 'open_text_page.dart';
12+
import 'save_text_page.dart';
13+
1314
void main() {
1415
runApp(const MyApp());
1516
}

packages/file_selector/file_selector_windows/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: file_selector_windows
22
description: Windows implementation of the file_selector plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_windows
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
5-
version: 0.9.1+2
5+
version: 0.9.1+3
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.2.1
2+
3+
* Updates imports for `prefer_relative_imports`.
4+
15
## 2.2.0
26

37
* Deprecates `AndroidGoogleMapsFlutter.useAndroidViewSurface` in favor of

packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
76
import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
8-
import 'package:google_maps_flutter_example/lite_mode.dart';
97
import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
8+
109
import 'animate_camera.dart';
10+
import 'lite_mode.dart';
1111
import 'map_click.dart';
1212
import 'map_coordinates.dart';
1313
import 'map_ui.dart';

packages/google_maps_flutter/google_maps_flutter/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter
22
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
33
repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
5-
version: 2.2.0
5+
version: 2.2.1
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.3.1
2+
3+
* Updates imports for `prefer_relative_imports`.
4+
15
## 2.3.0
26

37
* Switches the default for `useAndroidViewSurface` to true, and adds

0 commit comments

Comments
 (0)