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

Commit 8f83dc2

Browse files
[various] Standardize the extension for Pigeon-generated Dart (#7029)
* Standardize on .g.dart * Remove unused exclusion patterns * Mark pigeons/ as dev-only in the tooling * Version bumps * Add missed files * More new import fixes
1 parent 9da327c commit 8f83dc2

File tree

62 files changed

+78
-70
lines changed

Some content is hidden

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

62 files changed

+78
-70
lines changed

analysis_options.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ analyzer:
4747
exclude:
4848
# Ignore generated files
4949
- '**/*.g.dart'
50-
- 'lib/src/generated/*.dart'
5150
- '**/*.mocks.dart' # Mockito @GenerateMocks
52-
- '**/*.pigeon.dart' # Pigeon generated file
5351

5452
linter:
5553
rules:

packages/camera/camera_android_camerax/lib/src/android_camera_camerax_flutter_api_impls.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'camera.dart';
66
import 'camera_info.dart';
77
import 'camera_selector.dart';
8-
import 'camerax_library.pigeon.dart';
8+
import 'camerax_library.g.dart';
99
import 'java_object.dart';
1010
import 'process_camera_provider.dart';
1111
import 'system_services.dart';

packages/camera/camera_android_camerax/lib/src/camera.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:flutter/services.dart' show BinaryMessenger;
66

77
import 'android_camera_camerax_flutter_api_impls.dart';
8-
import 'camerax_library.pigeon.dart';
8+
import 'camerax_library.g.dart';
99
import 'instance_manager.dart';
1010
import 'java_object.dart';
1111

packages/camera/camera_android_camerax/lib/src/camera_info.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:flutter/services.dart' show BinaryMessenger;
66

77
import 'android_camera_camerax_flutter_api_impls.dart';
8-
import 'camerax_library.pigeon.dart';
8+
import 'camerax_library.g.dart';
99
import 'instance_manager.dart';
1010
import 'java_object.dart';
1111

packages/camera/camera_android_camerax/lib/src/camera_selector.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter/services.dart';
66

77
import 'android_camera_camerax_flutter_api_impls.dart';
88
import 'camera_info.dart';
9-
import 'camerax_library.pigeon.dart';
9+
import 'camerax_library.g.dart';
1010
import 'instance_manager.dart';
1111
import 'java_object.dart';
1212

packages/camera/camera_android_camerax/lib/src/java_object.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:flutter/foundation.dart' show immutable;
66
import 'package:flutter/services.dart';
77

8-
import 'camerax_library.pigeon.dart';
8+
import 'camerax_library.g.dart';
99
import 'instance_manager.dart';
1010

1111
/// Root of the Java class hierarchy.

packages/camera/camera_android_camerax/lib/src/process_camera_provider.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'android_camera_camerax_flutter_api_impls.dart';
88
import 'camera.dart';
99
import 'camera_info.dart';
1010
import 'camera_selector.dart';
11-
import 'camerax_library.pigeon.dart';
11+
import 'camerax_library.g.dart';
1212
import 'instance_manager.dart';
1313
import 'java_object.dart';
1414
import 'use_case.dart';

packages/camera/camera_android_camerax/lib/src/system_services.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:camera_platform_interface/camera_platform_interface.dart'
99
import 'package:flutter/services.dart';
1010

1111
import 'android_camera_camerax_flutter_api_impls.dart';
12-
import 'camerax_library.pigeon.dart';
12+
import 'camerax_library.g.dart';
1313

1414
// Ignoring lint indicating this class only contains static members
1515
// as this class is a wrapper for various Android system services.

packages/camera/camera_android_camerax/pigeons/camerax_library.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import 'package:pigeon/pigeon.dart';
66

77
@ConfigurePigeon(
88
PigeonOptions(
9-
dartOut: 'lib/src/camerax_library.pigeon.dart',
10-
dartTestOut: 'test/test_camerax_library.pigeon.dart',
9+
dartOut: 'lib/src/camerax_library.g.dart',
10+
dartTestOut: 'test/test_camerax_library.g.dart',
1111
dartOptions: DartOptions(copyrightHeader: <String>[
1212
'Copyright 2013 The Flutter Authors. All rights reserved.',
1313
'Use of this source code is governed by a BSD-style license that can be',

0 commit comments

Comments
 (0)