From 48e3856c48862c5f9565f04e33b6e39aa201060e Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Wed, 29 Jan 2025 17:29:37 -0800
Subject: [PATCH 1/6] reorg generator files

---
 packages/pigeon/lib/ast.dart                       |  4 ++--
 packages/pigeon/lib/{ => cpp}/cpp_generator.dart   | 10 +++++-----
 packages/pigeon/lib/{ => dart}/dart_generator.dart | 10 +++++-----
 .../lib/{ => gobject}/gobject_generator.dart       |  6 +++---
 packages/pigeon/lib/{ => java}/java_generator.dart | 10 +++++-----
 .../pigeon/lib/{ => kotlin}/kotlin_generator.dart  | 12 ++++++------
 packages/pigeon/lib/kotlin/templates.dart          |  2 +-
 packages/pigeon/lib/{ => objc}/objc_generator.dart | 10 +++++-----
 packages/pigeon/lib/pigeon.dart                    | 14 +++++++-------
 packages/pigeon/lib/pigeon_lib.dart                | 14 +++++++-------
 .../pigeon/lib/{ => swift}/swift_generator.dart    | 10 +++++-----
 packages/pigeon/test/cpp_generator_test.dart       |  2 +-
 packages/pigeon/test/dart/proxy_api_test.dart      |  2 +-
 packages/pigeon/test/dart_generator_test.dart      |  2 +-
 packages/pigeon/test/gobject_generator_test.dart   |  2 +-
 packages/pigeon/test/java_generator_test.dart      |  2 +-
 packages/pigeon/test/kotlin/proxy_api_test.dart    |  2 +-
 packages/pigeon/test/kotlin_generator_test.dart    |  2 +-
 packages/pigeon/test/objc_generator_test.dart      |  2 +-
 packages/pigeon/test/swift/proxy_api_test.dart     |  2 +-
 packages/pigeon/test/swift_generator_test.dart     |  2 +-
 21 files changed, 61 insertions(+), 61 deletions(-)
 rename packages/pigeon/lib/{ => cpp}/cpp_generator.dart (99%)
 rename packages/pigeon/lib/{ => dart}/dart_generator.dart (99%)
 rename packages/pigeon/lib/{ => gobject}/gobject_generator.dart (99%)
 rename packages/pigeon/lib/{ => java}/java_generator.dart (99%)
 rename packages/pigeon/lib/{ => kotlin}/kotlin_generator.dart (99%)
 rename packages/pigeon/lib/{ => objc}/objc_generator.dart (99%)
 rename packages/pigeon/lib/{ => swift}/swift_generator.dart (99%)

diff --git a/packages/pigeon/lib/ast.dart b/packages/pigeon/lib/ast.dart
index 5e65f31c98a..19d46523da4 100644
--- a/packages/pigeon/lib/ast.dart
+++ b/packages/pigeon/lib/ast.dart
@@ -6,9 +6,9 @@ import 'package:collection/collection.dart' show ListEquality;
 import 'package:meta/meta.dart';
 
 import 'generator_tools.dart';
-import 'kotlin_generator.dart' show KotlinProxyApiOptions;
+import 'kotlin/kotlin_generator.dart' show KotlinProxyApiOptions;
 import 'pigeon_lib.dart';
-import 'swift_generator.dart' show SwiftProxyApiOptions;
+import 'swift/swift_generator.dart' show SwiftProxyApiOptions;
 
 typedef _ListEquals = bool Function(List<Object?>, List<Object?>);
 
diff --git a/packages/pigeon/lib/cpp_generator.dart b/packages/pigeon/lib/cpp/cpp_generator.dart
similarity index 99%
rename from packages/pigeon/lib/cpp_generator.dart
rename to packages/pigeon/lib/cpp/cpp_generator.dart
index d911da47422..75de5af03a5 100644
--- a/packages/pigeon/lib/cpp_generator.dart
+++ b/packages/pigeon/lib/cpp/cpp_generator.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'ast.dart';
-import 'functional.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
-import 'pigeon_lib.dart' show Error;
+import '../ast.dart';
+import '../functional.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
+import '../pigeon_lib.dart' show Error;
 
 /// General comment opening token.
 const String _commentPrefix = '//';
diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart/dart_generator.dart
similarity index 99%
rename from packages/pigeon/lib/dart_generator.dart
rename to packages/pigeon/lib/dart/dart_generator.dart
index 58553b93489..05fe06d637a 100644
--- a/packages/pigeon/lib/dart_generator.dart
+++ b/packages/pigeon/lib/dart/dart_generator.dart
@@ -7,11 +7,11 @@ import 'package:dart_style/dart_style.dart';
 import 'package:path/path.dart' as path;
 import 'package:pub_semver/pub_semver.dart';
 
-import 'ast.dart';
-import 'dart/templates.dart';
-import 'functional.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
+import '../ast.dart';
+import '../functional.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
+import 'templates.dart';
 
 /// Documentation comment open symbol.
 const String _docCommentPrefix = '///';
diff --git a/packages/pigeon/lib/gobject_generator.dart b/packages/pigeon/lib/gobject/gobject_generator.dart
similarity index 99%
rename from packages/pigeon/lib/gobject_generator.dart
rename to packages/pigeon/lib/gobject/gobject_generator.dart
index 486b6143986..eb0d9e43240 100644
--- a/packages/pigeon/lib/gobject_generator.dart
+++ b/packages/pigeon/lib/gobject/gobject_generator.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'ast.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
+import '../ast.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
 
 /// Documentation comment spec.
 const DocumentCommentSpecification _docCommentSpec =
diff --git a/packages/pigeon/lib/java_generator.dart b/packages/pigeon/lib/java/java_generator.dart
similarity index 99%
rename from packages/pigeon/lib/java_generator.dart
rename to packages/pigeon/lib/java/java_generator.dart
index 938b20c2a05..c5fd0007b8f 100644
--- a/packages/pigeon/lib/java_generator.dart
+++ b/packages/pigeon/lib/java/java_generator.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'ast.dart';
-import 'functional.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
-import 'pigeon_lib.dart' show TaskQueueType;
+import '../ast.dart';
+import '../functional.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
+import '../pigeon_lib.dart' show TaskQueueType;
 
 /// Documentation open symbol.
 const String _docCommentPrefix = '/**';
diff --git a/packages/pigeon/lib/kotlin_generator.dart b/packages/pigeon/lib/kotlin/kotlin_generator.dart
similarity index 99%
rename from packages/pigeon/lib/kotlin_generator.dart
rename to packages/pigeon/lib/kotlin/kotlin_generator.dart
index f0a185cdcc7..9f33dc58b36 100644
--- a/packages/pigeon/lib/kotlin_generator.dart
+++ b/packages/pigeon/lib/kotlin/kotlin_generator.dart
@@ -4,12 +4,12 @@
 
 import 'package:graphs/graphs.dart';
 
-import 'ast.dart';
-import 'functional.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
-import 'kotlin/templates.dart';
-import 'pigeon_lib.dart' show TaskQueueType;
+import '../ast.dart';
+import '../functional.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
+import '../pigeon_lib.dart' show TaskQueueType;
+import 'templates.dart';
 
 /// Documentation open symbol.
 const String _docCommentPrefix = '/**';
diff --git a/packages/pigeon/lib/kotlin/templates.dart b/packages/pigeon/lib/kotlin/templates.dart
index 5f85078588b..0dfdb08c1b8 100644
--- a/packages/pigeon/lib/kotlin/templates.dart
+++ b/packages/pigeon/lib/kotlin/templates.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import '../generator_tools.dart';
-import '../kotlin_generator.dart';
+import 'kotlin_generator.dart';
 
 /// Name of the Kotlin `InstanceManager`.
 String kotlinInstanceManagerClassName(KotlinOptions options) =>
diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc/objc_generator.dart
similarity index 99%
rename from packages/pigeon/lib/objc_generator.dart
rename to packages/pigeon/lib/objc/objc_generator.dart
index ed6bd37ac76..e37d3bbcba8 100644
--- a/packages/pigeon/lib/objc_generator.dart
+++ b/packages/pigeon/lib/objc/objc_generator.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'ast.dart';
-import 'functional.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
-import 'pigeon_lib.dart' show Error, TaskQueueType;
+import '../ast.dart';
+import '../functional.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
+import '../pigeon_lib.dart' show Error, TaskQueueType;
 
 /// Documentation comment open symbol.
 const String _docCommentPrefix = '///';
diff --git a/packages/pigeon/lib/pigeon.dart b/packages/pigeon/lib/pigeon.dart
index bfa23ad5801..499fc05955f 100644
--- a/packages/pigeon/lib/pigeon.dart
+++ b/packages/pigeon/lib/pigeon.dart
@@ -4,11 +4,11 @@
 
 export 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
 
-export 'cpp_generator.dart' show CppOptions;
-export 'dart_generator.dart' show DartOptions;
-export 'gobject_generator.dart' show GObjectOptions;
-export 'java_generator.dart' show JavaOptions;
-export 'kotlin_generator.dart' show KotlinOptions, KotlinProxyApiOptions;
-export 'objc_generator.dart' show ObjcOptions;
+export 'cpp/cpp_generator.dart' show CppOptions;
+export 'dart/dart_generator.dart' show DartOptions;
+export 'gobject/gobject_generator.dart' show GObjectOptions;
+export 'java/java_generator.dart' show JavaOptions;
+export 'kotlin/kotlin_generator.dart' show KotlinOptions, KotlinProxyApiOptions;
+export 'objc/objc_generator.dart' show ObjcOptions;
 export 'pigeon_lib.dart';
-export 'swift_generator.dart' show SwiftOptions, SwiftProxyApiOptions;
+export 'swift/swift_generator.dart' show SwiftOptions, SwiftProxyApiOptions;
diff --git a/packages/pigeon/lib/pigeon_lib.dart b/packages/pigeon/lib/pigeon_lib.dart
index 4a4501e3250..d177c1ee7e8 100644
--- a/packages/pigeon/lib/pigeon_lib.dart
+++ b/packages/pigeon/lib/pigeon_lib.dart
@@ -27,15 +27,15 @@ import 'package:pub_semver/pub_semver.dart';
 
 import 'ast.dart';
 import 'ast_generator.dart';
-import 'cpp_generator.dart';
-import 'dart_generator.dart';
+import 'cpp/cpp_generator.dart';
+import 'dart/dart_generator.dart';
 import 'generator_tools.dart';
 import 'generator_tools.dart' as generator_tools;
-import 'gobject_generator.dart';
-import 'java_generator.dart';
-import 'kotlin_generator.dart';
-import 'objc_generator.dart';
-import 'swift_generator.dart';
+import 'gobject/gobject_generator.dart';
+import 'java/java_generator.dart';
+import 'kotlin/kotlin_generator.dart';
+import 'objc/objc_generator.dart';
+import 'swift/swift_generator.dart';
 
 class _Asynchronous {
   const _Asynchronous();
diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift/swift_generator.dart
similarity index 99%
rename from packages/pigeon/lib/swift_generator.dart
rename to packages/pigeon/lib/swift/swift_generator.dart
index d5c09d4ec17..1634cec6bc1 100644
--- a/packages/pigeon/lib/swift_generator.dart
+++ b/packages/pigeon/lib/swift/swift_generator.dart
@@ -5,11 +5,11 @@
 import 'package:graphs/graphs.dart';
 import 'package:pub_semver/pub_semver.dart';
 
-import 'ast.dart';
-import 'functional.dart';
-import 'generator.dart';
-import 'generator_tools.dart';
-import 'swift/templates.dart';
+import '../ast.dart';
+import '../functional.dart';
+import '../generator.dart';
+import '../generator_tools.dart';
+import 'templates.dart';
 
 /// Documentation comment open symbol.
 const String _docCommentPrefix = '///';
diff --git a/packages/pigeon/test/cpp_generator_test.dart b/packages/pigeon/test/cpp_generator_test.dart
index c88311f4c5b..e579afd4470 100644
--- a/packages/pigeon/test/cpp_generator_test.dart
+++ b/packages/pigeon/test/cpp_generator_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/cpp_generator.dart';
+import 'package:pigeon/cpp/cpp_generator.dart';
 import 'package:pigeon/generator_tools.dart';
 import 'package:pigeon/pigeon.dart' show Error;
 import 'package:test/test.dart';
diff --git a/packages/pigeon/test/dart/proxy_api_test.dart b/packages/pigeon/test/dart/proxy_api_test.dart
index 6e3377af72b..6ddea1c81b1 100644
--- a/packages/pigeon/test/dart/proxy_api_test.dart
+++ b/packages/pigeon/test/dart/proxy_api_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/dart_generator.dart';
+import 'package:pigeon/dart/dart_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart
index 7a4d44c2617..2cf3b6a94e3 100644
--- a/packages/pigeon/test/dart_generator_test.dart
+++ b/packages/pigeon/test/dart_generator_test.dart
@@ -6,7 +6,7 @@ import 'dart:io' show Directory, File;
 
 import 'package:path/path.dart' as path;
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/dart_generator.dart';
+import 'package:pigeon/dart/dart_generator.dart';
 import 'package:pigeon/generator_tools.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/pigeon/test/gobject_generator_test.dart b/packages/pigeon/test/gobject_generator_test.dart
index 3b9d90ad164..8248ff3497c 100644
--- a/packages/pigeon/test/gobject_generator_test.dart
+++ b/packages/pigeon/test/gobject_generator_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:pigeon/ast.dart';
 import 'package:pigeon/generator_tools.dart';
-import 'package:pigeon/gobject_generator.dart';
+import 'package:pigeon/gobject/gobject_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart
index 49358cf7dda..d42a9cf26dd 100644
--- a/packages/pigeon/test/java_generator_test.dart
+++ b/packages/pigeon/test/java_generator_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/java_generator.dart';
+import 'package:pigeon/java/java_generator.dart';
 import 'package:pigeon/pigeon.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart
index d6ddd35377b..0df69b963bb 100644
--- a/packages/pigeon/test/kotlin/proxy_api_test.dart
+++ b/packages/pigeon/test/kotlin/proxy_api_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/kotlin_generator.dart';
+import 'package:pigeon/kotlin/kotlin_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart
index 6043229fd72..b9244383a82 100644
--- a/packages/pigeon/test/kotlin_generator_test.dart
+++ b/packages/pigeon/test/kotlin_generator_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/kotlin_generator.dart';
+import 'package:pigeon/kotlin/kotlin_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/objc_generator_test.dart b/packages/pigeon/test/objc_generator_test.dart
index 728bb50ac9c..568702b572a 100644
--- a/packages/pigeon/test/objc_generator_test.dart
+++ b/packages/pigeon/test/objc_generator_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:pigeon/ast.dart';
 import 'package:pigeon/generator_tools.dart';
-import 'package:pigeon/objc_generator.dart';
+import 'package:pigeon/objc/objc_generator.dart';
 import 'package:pigeon/pigeon_lib.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/pigeon/test/swift/proxy_api_test.dart b/packages/pigeon/test/swift/proxy_api_test.dart
index d149d5d0102..22e1f254d27 100644
--- a/packages/pigeon/test/swift/proxy_api_test.dart
+++ b/packages/pigeon/test/swift/proxy_api_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/swift_generator.dart';
+import 'package:pigeon/swift/swift_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart
index 6ad36f934ec..a17d226067c 100644
--- a/packages/pigeon/test/swift_generator_test.dart
+++ b/packages/pigeon/test/swift_generator_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:pigeon/ast.dart';
-import 'package:pigeon/swift_generator.dart';
+import 'package:pigeon/swift/swift_generator.dart';
 import 'package:test/test.dart';
 
 import 'dart_generator_test.dart';

From 0a31afbac152075a576711fde229811240ec0477 Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Thu, 30 Jan 2025 13:53:46 -0800
Subject: [PATCH 2/6] move to src

---
 packages/pigeon/bin/pigeon.dart                 |  2 +-
 packages/pigeon/lib/pigeon.dart                 | 17 +++++++++--------
 packages/pigeon/lib/{ => src}/ast.dart          |  0
 .../pigeon/lib/{ => src}/ast_generator.dart     |  0
 .../pigeon/lib/{ => src}/cpp/cpp_generator.dart |  0
 .../lib/{ => src}/dart/dart_generator.dart      |  0
 .../pigeon/lib/{ => src}/dart/templates.dart    |  0
 packages/pigeon/lib/{ => src}/functional.dart   |  0
 packages/pigeon/lib/{ => src}/generator.dart    |  0
 .../pigeon/lib/{ => src}/generator_tools.dart   |  0
 .../{ => src}/gobject/gobject_generator.dart    |  0
 .../lib/{ => src}/java/java_generator.dart      |  0
 .../lib/{ => src}/kotlin/kotlin_generator.dart  |  0
 .../pigeon/lib/{ => src}/kotlin/templates.dart  |  0
 .../lib/{ => src}/objc/objc_generator.dart      |  0
 packages/pigeon/lib/{ => src}/pigeon_cl.dart    |  0
 packages/pigeon/lib/{ => src}/pigeon_lib.dart   |  0
 .../lib/{ => src}/swift/swift_generator.dart    |  0
 .../pigeon/lib/{ => src}/swift/templates.dart   |  2 +-
 packages/pigeon/test/ast_generator_test.dart    |  4 ++--
 packages/pigeon/test/cpp_generator_test.dart    |  6 +++---
 packages/pigeon/test/dart/proxy_api_test.dart   |  4 ++--
 packages/pigeon/test/dart_generator_test.dart   |  6 +++---
 packages/pigeon/test/functional_test.dart       |  2 +-
 packages/pigeon/test/generator_tools_test.dart  |  4 ++--
 .../pigeon/test/gobject_generator_test.dart     |  6 +++---
 packages/pigeon/test/java_generator_test.dart   |  4 ++--
 packages/pigeon/test/kotlin/proxy_api_test.dart |  4 ++--
 packages/pigeon/test/kotlin_generator_test.dart |  4 ++--
 packages/pigeon/test/objc_generator_test.dart   |  8 ++++----
 packages/pigeon/test/pigeon_lib_test.dart       |  6 +++---
 packages/pigeon/test/swift/proxy_api_test.dart  |  4 ++--
 packages/pigeon/test/swift_generator_test.dart  |  4 ++--
 packages/pigeon/test/version_test.dart          |  2 +-
 packages/pigeon/tool/shared/generation.dart     |  2 +-
 35 files changed, 46 insertions(+), 45 deletions(-)
 rename packages/pigeon/lib/{ => src}/ast.dart (100%)
 rename packages/pigeon/lib/{ => src}/ast_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/cpp/cpp_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/dart/dart_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/dart/templates.dart (100%)
 rename packages/pigeon/lib/{ => src}/functional.dart (100%)
 rename packages/pigeon/lib/{ => src}/generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/generator_tools.dart (100%)
 rename packages/pigeon/lib/{ => src}/gobject/gobject_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/java/java_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/kotlin/kotlin_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/kotlin/templates.dart (100%)
 rename packages/pigeon/lib/{ => src}/objc/objc_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/pigeon_cl.dart (100%)
 rename packages/pigeon/lib/{ => src}/pigeon_lib.dart (100%)
 rename packages/pigeon/lib/{ => src}/swift/swift_generator.dart (100%)
 rename packages/pigeon/lib/{ => src}/swift/templates.dart (99%)

diff --git a/packages/pigeon/bin/pigeon.dart b/packages/pigeon/bin/pigeon.dart
index b96295a8110..0303aaf06b2 100644
--- a/packages/pigeon/bin/pigeon.dart
+++ b/packages/pigeon/bin/pigeon.dart
@@ -4,7 +4,7 @@
 
 import 'dart:io' show exit;
 
-import 'package:pigeon/pigeon_cl.dart';
+import 'package:pigeon/src/pigeon_cl.dart';
 
 Future<void> main(List<String> args) async {
   exit(await runCommandLine(args));
diff --git a/packages/pigeon/lib/pigeon.dart b/packages/pigeon/lib/pigeon.dart
index 499fc05955f..8ea44e7e141 100644
--- a/packages/pigeon/lib/pigeon.dart
+++ b/packages/pigeon/lib/pigeon.dart
@@ -4,11 +4,12 @@
 
 export 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
 
-export 'cpp/cpp_generator.dart' show CppOptions;
-export 'dart/dart_generator.dart' show DartOptions;
-export 'gobject/gobject_generator.dart' show GObjectOptions;
-export 'java/java_generator.dart' show JavaOptions;
-export 'kotlin/kotlin_generator.dart' show KotlinOptions, KotlinProxyApiOptions;
-export 'objc/objc_generator.dart' show ObjcOptions;
-export 'pigeon_lib.dart';
-export 'swift/swift_generator.dart' show SwiftOptions, SwiftProxyApiOptions;
+export 'src/cpp/cpp_generator.dart' show CppOptions;
+export 'src/dart/dart_generator.dart' show DartOptions;
+export 'src/gobject/gobject_generator.dart' show GObjectOptions;
+export 'src/java/java_generator.dart' show JavaOptions;
+export 'src/kotlin/kotlin_generator.dart'
+    show KotlinOptions, KotlinProxyApiOptions;
+export 'src/objc/objc_generator.dart' show ObjcOptions;
+export 'src/pigeon_lib.dart';
+export 'src/swift/swift_generator.dart' show SwiftOptions, SwiftProxyApiOptions;
diff --git a/packages/pigeon/lib/ast.dart b/packages/pigeon/lib/src/ast.dart
similarity index 100%
rename from packages/pigeon/lib/ast.dart
rename to packages/pigeon/lib/src/ast.dart
diff --git a/packages/pigeon/lib/ast_generator.dart b/packages/pigeon/lib/src/ast_generator.dart
similarity index 100%
rename from packages/pigeon/lib/ast_generator.dart
rename to packages/pigeon/lib/src/ast_generator.dart
diff --git a/packages/pigeon/lib/cpp/cpp_generator.dart b/packages/pigeon/lib/src/cpp/cpp_generator.dart
similarity index 100%
rename from packages/pigeon/lib/cpp/cpp_generator.dart
rename to packages/pigeon/lib/src/cpp/cpp_generator.dart
diff --git a/packages/pigeon/lib/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart
similarity index 100%
rename from packages/pigeon/lib/dart/dart_generator.dart
rename to packages/pigeon/lib/src/dart/dart_generator.dart
diff --git a/packages/pigeon/lib/dart/templates.dart b/packages/pigeon/lib/src/dart/templates.dart
similarity index 100%
rename from packages/pigeon/lib/dart/templates.dart
rename to packages/pigeon/lib/src/dart/templates.dart
diff --git a/packages/pigeon/lib/functional.dart b/packages/pigeon/lib/src/functional.dart
similarity index 100%
rename from packages/pigeon/lib/functional.dart
rename to packages/pigeon/lib/src/functional.dart
diff --git a/packages/pigeon/lib/generator.dart b/packages/pigeon/lib/src/generator.dart
similarity index 100%
rename from packages/pigeon/lib/generator.dart
rename to packages/pigeon/lib/src/generator.dart
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart
similarity index 100%
rename from packages/pigeon/lib/generator_tools.dart
rename to packages/pigeon/lib/src/generator_tools.dart
diff --git a/packages/pigeon/lib/gobject/gobject_generator.dart b/packages/pigeon/lib/src/gobject/gobject_generator.dart
similarity index 100%
rename from packages/pigeon/lib/gobject/gobject_generator.dart
rename to packages/pigeon/lib/src/gobject/gobject_generator.dart
diff --git a/packages/pigeon/lib/java/java_generator.dart b/packages/pigeon/lib/src/java/java_generator.dart
similarity index 100%
rename from packages/pigeon/lib/java/java_generator.dart
rename to packages/pigeon/lib/src/java/java_generator.dart
diff --git a/packages/pigeon/lib/kotlin/kotlin_generator.dart b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart
similarity index 100%
rename from packages/pigeon/lib/kotlin/kotlin_generator.dart
rename to packages/pigeon/lib/src/kotlin/kotlin_generator.dart
diff --git a/packages/pigeon/lib/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart
similarity index 100%
rename from packages/pigeon/lib/kotlin/templates.dart
rename to packages/pigeon/lib/src/kotlin/templates.dart
diff --git a/packages/pigeon/lib/objc/objc_generator.dart b/packages/pigeon/lib/src/objc/objc_generator.dart
similarity index 100%
rename from packages/pigeon/lib/objc/objc_generator.dart
rename to packages/pigeon/lib/src/objc/objc_generator.dart
diff --git a/packages/pigeon/lib/pigeon_cl.dart b/packages/pigeon/lib/src/pigeon_cl.dart
similarity index 100%
rename from packages/pigeon/lib/pigeon_cl.dart
rename to packages/pigeon/lib/src/pigeon_cl.dart
diff --git a/packages/pigeon/lib/pigeon_lib.dart b/packages/pigeon/lib/src/pigeon_lib.dart
similarity index 100%
rename from packages/pigeon/lib/pigeon_lib.dart
rename to packages/pigeon/lib/src/pigeon_lib.dart
diff --git a/packages/pigeon/lib/swift/swift_generator.dart b/packages/pigeon/lib/src/swift/swift_generator.dart
similarity index 100%
rename from packages/pigeon/lib/swift/swift_generator.dart
rename to packages/pigeon/lib/src/swift/swift_generator.dart
diff --git a/packages/pigeon/lib/swift/templates.dart b/packages/pigeon/lib/src/swift/templates.dart
similarity index 99%
rename from packages/pigeon/lib/swift/templates.dart
rename to packages/pigeon/lib/src/swift/templates.dart
index d67e8acf18f..b21fbfc35bf 100644
--- a/packages/pigeon/lib/swift/templates.dart
+++ b/packages/pigeon/lib/src/swift/templates.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import '../generator_tools.dart';
-import '../pigeon.dart';
+import '../../pigeon.dart';
 
 /// Name of delegate that handles the callback when an object is deallocated
 /// in an `InstanceManager`.
diff --git a/packages/pigeon/test/ast_generator_test.dart b/packages/pigeon/test/ast_generator_test.dart
index 01cf75beafd..21ebf09d5b8 100644
--- a/packages/pigeon/test/ast_generator_test.dart
+++ b/packages/pigeon/test/ast_generator_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/ast_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/ast_generator.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/pigeon/test/cpp_generator_test.dart b/packages/pigeon/test/cpp_generator_test.dart
index e579afd4470..bd903310a68 100644
--- a/packages/pigeon/test/cpp_generator_test.dart
+++ b/packages/pigeon/test/cpp_generator_test.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/cpp/cpp_generator.dart';
-import 'package:pigeon/generator_tools.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/cpp/cpp_generator.dart';
+import 'package:pigeon/src/generator_tools.dart';
 import 'package:pigeon/pigeon.dart' show Error;
 import 'package:test/test.dart';
 
diff --git a/packages/pigeon/test/dart/proxy_api_test.dart b/packages/pigeon/test/dart/proxy_api_test.dart
index 6ddea1c81b1..7f0cfc60f2f 100644
--- a/packages/pigeon/test/dart/proxy_api_test.dart
+++ b/packages/pigeon/test/dart/proxy_api_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/dart/dart_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/dart/dart_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart
index 2cf3b6a94e3..ace2645e386 100644
--- a/packages/pigeon/test/dart_generator_test.dart
+++ b/packages/pigeon/test/dart_generator_test.dart
@@ -5,9 +5,9 @@
 import 'dart:io' show Directory, File;
 
 import 'package:path/path.dart' as path;
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/dart/dart_generator.dart';
-import 'package:pigeon/generator_tools.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/dart/dart_generator.dart';
+import 'package:pigeon/src/generator_tools.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/functional_test.dart b/packages/pigeon/test/functional_test.dart
index 1c2079ccae4..62ee434a6b0 100644
--- a/packages/pigeon/test/functional_test.dart
+++ b/packages/pigeon/test/functional_test.dart
@@ -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 'package:pigeon/functional.dart';
+import 'package:pigeon/src/functional.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/pigeon/test/generator_tools_test.dart b/packages/pigeon/test/generator_tools_test.dart
index 2ed9239b0a2..34286260aab 100644
--- a/packages/pigeon/test/generator_tools_test.dart
+++ b/packages/pigeon/test/generator_tools_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/generator_tools.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/generator_tools.dart';
 import 'package:test/test.dart';
 
 bool _equalSet<T>(Set<T> x, Set<T> y) {
diff --git a/packages/pigeon/test/gobject_generator_test.dart b/packages/pigeon/test/gobject_generator_test.dart
index 8248ff3497c..fdcd5718e07 100644
--- a/packages/pigeon/test/gobject_generator_test.dart
+++ b/packages/pigeon/test/gobject_generator_test.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/generator_tools.dart';
-import 'package:pigeon/gobject/gobject_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/generator_tools.dart';
+import 'package:pigeon/src/gobject/gobject_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart
index d42a9cf26dd..c811534145b 100644
--- a/packages/pigeon/test/java_generator_test.dart
+++ b/packages/pigeon/test/java_generator_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/java/java_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/java/java_generator.dart';
 import 'package:pigeon/pigeon.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart
index 0df69b963bb..b14f6d25746 100644
--- a/packages/pigeon/test/kotlin/proxy_api_test.dart
+++ b/packages/pigeon/test/kotlin/proxy_api_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/kotlin/kotlin_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/kotlin/kotlin_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart
index b9244383a82..00e2c542bd2 100644
--- a/packages/pigeon/test/kotlin_generator_test.dart
+++ b/packages/pigeon/test/kotlin_generator_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/kotlin/kotlin_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/kotlin/kotlin_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/objc_generator_test.dart b/packages/pigeon/test/objc_generator_test.dart
index 568702b572a..74162325f04 100644
--- a/packages/pigeon/test/objc_generator_test.dart
+++ b/packages/pigeon/test/objc_generator_test.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/generator_tools.dart';
-import 'package:pigeon/objc/objc_generator.dart';
-import 'package:pigeon/pigeon_lib.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/generator_tools.dart';
+import 'package:pigeon/src/objc/objc_generator.dart';
+import 'package:pigeon/src/pigeon_lib.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/pigeon_lib_test.dart b/packages/pigeon/test/pigeon_lib_test.dart
index bf6fc7cbca1..ab8dda4b324 100644
--- a/packages/pigeon/test/pigeon_lib_test.dart
+++ b/packages/pigeon/test/pigeon_lib_test.dart
@@ -5,9 +5,9 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/generator_tools.dart';
-import 'package:pigeon/pigeon_lib.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/generator_tools.dart';
+import 'package:pigeon/src/pigeon_lib.dart';
 import 'package:test/test.dart';
 
 class _ValidatorGeneratorAdapter implements GeneratorAdapter {
diff --git a/packages/pigeon/test/swift/proxy_api_test.dart b/packages/pigeon/test/swift/proxy_api_test.dart
index 22e1f254d27..26c679ba303 100644
--- a/packages/pigeon/test/swift/proxy_api_test.dart
+++ b/packages/pigeon/test/swift/proxy_api_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/swift/swift_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/swift/swift_generator.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart
index a17d226067c..abad2c200aa 100644
--- a/packages/pigeon/test/swift_generator_test.dart
+++ b/packages/pigeon/test/swift_generator_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:pigeon/ast.dart';
-import 'package:pigeon/swift/swift_generator.dart';
+import 'package:pigeon/src/ast.dart';
+import 'package:pigeon/src/swift/swift_generator.dart';
 import 'package:test/test.dart';
 
 import 'dart_generator_test.dart';
diff --git a/packages/pigeon/test/version_test.dart b/packages/pigeon/test/version_test.dart
index 45c62682fcc..a4b8dbcb2b9 100644
--- a/packages/pigeon/test/version_test.dart
+++ b/packages/pigeon/test/version_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:pigeon/generator_tools.dart';
+import 'package:pigeon/src/generator_tools.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/pigeon/tool/shared/generation.dart b/packages/pigeon/tool/shared/generation.dart
index fdb50384366..057b8b964dd 100644
--- a/packages/pigeon/tool/shared/generation.dart
+++ b/packages/pigeon/tool/shared/generation.dart
@@ -5,8 +5,8 @@
 import 'dart:io' show Platform;
 
 import 'package:path/path.dart' as p;
-import 'package:pigeon/generator_tools.dart';
 import 'package:pigeon/pigeon.dart';
+import 'package:pigeon/src/generator_tools.dart';
 
 import 'process_utils.dart';
 

From 3904870c3b8ebbc368354ef9ac09b72f7085ea88 Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Thu, 30 Jan 2025 14:20:41 -0800
Subject: [PATCH 3/6] version and comment clean up

---
 packages/pigeon/CHANGELOG.md                 |  4 ++++
 packages/pigeon/CONTRIBUTING.md              | 20 ++++++++++----------
 packages/pigeon/lib/src/generator_tools.dart |  2 +-
 packages/pigeon/pubspec.yaml                 |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index 7724e95d9ae..aab8c8561ae 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 23.0.0
+
+* Relocates `lib` files to `src` directory.
+
 ## 22.7.4
 
 * [dart] Fixes bug with multi-instance event channel support.
diff --git a/packages/pigeon/CONTRIBUTING.md b/packages/pigeon/CONTRIBUTING.md
index 4bf96c20808..810671531b8 100644
--- a/packages/pigeon/CONTRIBUTING.md
+++ b/packages/pigeon/CONTRIBUTING.md
@@ -18,18 +18,18 @@ generators with that AST.
 
 ## Source Index
 
-* [ast.dart](./lib/ast.dart) - The data structure for representing the Abstract Syntax Tree.
-* [dart_generator.dart](./lib/dart_generator.dart) - The Dart code generator.
-* [java_generator.dart](./lib/java_generator.dart) - The Java code generator.
-* [kotlin_generator.dart](./lib/kotlin_generator.dart) - The Kotlin code generator.
-* [objc_generator.dart](./lib/objc_generator.dart) - The Objective-C code
+* [ast.dart](./lib/src/ast.dart) - The data structure for representing the Abstract Syntax Tree.
+* [dart_generator.dart](./lib/src/dart_generator.dart) - The Dart code generator.
+* [java_generator.dart](./lib/src/java_generator.dart) - The Java code generator.
+* [kotlin_generator.dart](./lib/src/kotlin_generator.dart) - The Kotlin code generator.
+* [objc_generator.dart](./lib/src/objc_generator.dart) - The Objective-C code
   generator (header and source files).
-* [swift_generator.dart](./lib/swift_generator.dart) - The Swift code generator.
-* [cpp_generator.dart](./lib/cpp_generator.dart) - The C++ code generator.
-* [generator_tools.dart](./lib/generator_tools.dart) - Shared code between generators.
-* [pigeon_cl.dart](./lib/pigeon_cl.dart) - The top-level function executed by
+* [swift_generator.dart](./lib/src/swift_generator.dart) - The Swift code generator.
+* [cpp_generator.dart](./lib/src/cpp_generator.dart) - The C++ code generator.
+* [generator_tools.dart](./lib/src/generator_tools.dart) - Shared code between generators.
+* [pigeon_cl.dart](./lib/src/pigeon_cl.dart) - The top-level function executed by
   the command line tool in [bin/][./bin].
-* [pigeon_lib.dart](./lib/pigeon_lib.dart) - The top-level function for the
+* [pigeon_lib.dart](./lib/src/pigeon_lib.dart) - The top-level function for the
   PigeonIsolate and the AST generation code.
 * [pigeon.dart](./lib/pigeon.dart) - A file of exported modules, the intended
   import for users of Pigeon.
diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart
index 7e301b4b16b..c5a5788e91a 100644
--- a/packages/pigeon/lib/src/generator_tools.dart
+++ b/packages/pigeon/lib/src/generator_tools.dart
@@ -14,7 +14,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '22.7.4';
+const String pigeonVersion = '23.0.0';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index 021284ad7f9..8cf3368fc8e 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -2,7 +2,7 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 22.7.4 # This must match the version in lib/generator_tools.dart
+version: 23.0.0 # This must match the version in lib/src/generator_tools.dart
 
 environment:
   sdk: ^3.4.0

From cd61ce770a11238e512e789f53c011351e831ead Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Thu, 30 Jan 2025 14:22:46 -0800
Subject: [PATCH 4/6] update import order

---
 packages/pigeon/lib/src/swift/templates.dart  | 2 +-
 packages/pigeon/test/cpp_generator_test.dart  | 2 +-
 packages/pigeon/test/java_generator_test.dart | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/pigeon/lib/src/swift/templates.dart b/packages/pigeon/lib/src/swift/templates.dart
index b21fbfc35bf..6c48ed93f07 100644
--- a/packages/pigeon/lib/src/swift/templates.dart
+++ b/packages/pigeon/lib/src/swift/templates.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../generator_tools.dart';
 import '../../pigeon.dart';
+import '../generator_tools.dart';
 
 /// Name of delegate that handles the callback when an object is deallocated
 /// in an `InstanceManager`.
diff --git a/packages/pigeon/test/cpp_generator_test.dart b/packages/pigeon/test/cpp_generator_test.dart
index bd903310a68..d79eec28419 100644
--- a/packages/pigeon/test/cpp_generator_test.dart
+++ b/packages/pigeon/test/cpp_generator_test.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:pigeon/pigeon.dart' show Error;
 import 'package:pigeon/src/ast.dart';
 import 'package:pigeon/src/cpp/cpp_generator.dart';
 import 'package:pigeon/src/generator_tools.dart';
-import 'package:pigeon/pigeon.dart' show Error;
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';
diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart
index c811534145b..a8dc3c36edd 100644
--- a/packages/pigeon/test/java_generator_test.dart
+++ b/packages/pigeon/test/java_generator_test.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:pigeon/pigeon.dart';
 import 'package:pigeon/src/ast.dart';
 import 'package:pigeon/src/java/java_generator.dart';
-import 'package:pigeon/pigeon.dart';
 import 'package:test/test.dart';
 
 const String DEFAULT_PACKAGE_NAME = 'test_package';

From 78235ebc05270f5fc7c707a7f26c80e3df743f66 Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Mon, 3 Feb 2025 11:02:47 -0800
Subject: [PATCH 5/6] proper changelog

---
 packages/pigeon/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index aab8c8561ae..cb859ebbc96 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 23.0.0
 
-* Relocates `lib` files to `src` directory.
+* **Breaking Change** Relocates some files in `lib` that were not intended for direct client use to `lib/src`.
 
 ## 22.7.4
 

From 962cd89cba817d4d57a658e19381b931bb8ee71c Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Mon, 3 Feb 2025 11:06:43 -0800
Subject: [PATCH 6/6] gen tool vers

---
 packages/pigeon/lib/src/generator_tools.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart
index c5a5788e91a..2c89f595d9a 100644
--- a/packages/pigeon/lib/src/generator_tools.dart
+++ b/packages/pigeon/lib/src/generator_tools.dart
@@ -14,7 +14,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '23.0.0';
+const String pigeonVersion = '24.0.0';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {