Skip podspec Swift Search Path validation if only swift file is Packa…

…ge.swift for darwin plugins (#6635) Fix for iOS was added in #6627, but neglected to handle when plugin uses darwin directory. Supplemental fix for flutter/flutter#147548.
flutter · May 2, 2024 · 62c08f4 · 62c08f4
1 parent 1856a6e
commit 62c08f4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/script/tool/lib/src/podspec_check_command.dart b/script/tool/lib/src/podspec_check_command.dart
@@ -169,6 +169,11 @@ class PodspecCheckCommand extends PackageLoopingCommand {
         .childDirectory(package.directory.basename)
         .childFile('Package.swift')
         .path;
+    final String darwinSwiftPackageManifestPath = package.directory
+        .childDirectory('darwin')
+        .childDirectory(package.directory.basename)
+        .childFile('Package.swift')
+        .path;
     return getFilesForPackage(package).any((File entity) {
       final String relativePath =
           getRelativePosixPath(entity, from: package.directory);
@@ -178,6 +183,7 @@ class PodspecCheckCommand extends PackageLoopingCommand {
       }
       final String filePath = entity.path;
       return filePath != iosSwiftPackageManifestPath &&
+          filePath != darwinSwiftPackageManifestPath &&
           path.extension(filePath) == '.swift';
     });
   }

diff --git a/script/tool/test/podspec_check_command_test.dart b/script/tool/test/podspec_check_command_test.dart
@@ -405,6 +405,28 @@ void main() {
           ));
     });
 
+    test(
+        'does not require the search paths workaround for darwin Package.swift',
+        () async {
+      final RepositoryPackage plugin = createFakePlugin(
+        'plugin1',
+        packagesDir,
+        extraFiles: <String>['darwin/plugin1/Package.swift'],
+      );
+      _writeFakePodspec(plugin, 'darwin');
+
+      final List<String> output =
+          await runCapturingPrint(runner, <String>['podspec-check']);
+
+      expect(
+          output,
+          containsAllInOrder(
+            <Matcher>[
+              contains('Ran for 1 package(s)'),
+            ],
+          ));
+    });
+
     test('does not require the search paths workaround for macOS plugins',
         () async {
       final RepositoryPackage plugin = createFakePlugin('plugin1', packagesDir,