review comments

grpc · Jan 21, 2025 · 15fbb1a · 15fbb1a
1 parent 86f8893
commit 15fbb1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Plugins/GRPCProtobufGenerator/Plugin.swift b/Plugins/GRPCProtobufGenerator/Plugin.swift
@@ -97,7 +97,8 @@ struct GRPCProtobufGenerator {
           baseDirectoryPath: configFilePath.deletingLastPathComponent(),
           protoDirectoryPaths: protoDirectoryPaths,
           protocPath: protocPath,
-          protocGenGRPCSwiftPath: protocGenGRPCSwiftPath
+          protocGenGRPCSwiftPath: protocGenGRPCSwiftPath,
+          configFilePath: configFilePath
         )
         commands.append(grpcCommand)
       }
@@ -174,14 +175,16 @@ extension [URL: GenerationConfig] {
 ///   - protoDirectoryPaths: The paths passed to `protoc` in which to look for imported proto files.
 ///   - protocPath: The path to `protoc`
 ///   - protocGenGRPCSwiftPath: The path to `protoc-gen-grpc-swift`.
+///   - configFilePath: The path to the config file in use.
 /// - Returns: The command to invoke `protoc` with the `protoc-gen-grpc-swift` plugin.
 func protocGenGRPCSwiftCommand(
   inputFile: URL,
   config: GenerationConfig,
   baseDirectoryPath: URL,
   protoDirectoryPaths: [String],
   protocPath: URL,
-  protocGenGRPCSwiftPath: URL
+  protocGenGRPCSwiftPath: URL,
+  configFilePath: URL
 ) throws -> PackagePlugin.Command {
   let outputPathURL = URL(fileURLWithPath: config.outputPath)
 
@@ -205,7 +208,11 @@ func protocGenGRPCSwiftCommand(
     displayName: "Generating gRPC Swift files for \(inputFile.absoluteStringNoScheme)",
     executable: protocPath,
     arguments: arguments,
-    inputFiles: [inputFile, protocGenGRPCSwiftPath],
+    inputFiles: [
+      inputFile,
+      protocGenGRPCSwiftPath,
+      configFilePath,
+    ],
     outputFiles: [outputFilePath]
   )
 }

diff --git a/Plugins/PluginsShared/PluginError.swift b/Plugins/PluginsShared/PluginError.swift
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import Foundation
-
 enum PluginError: Error {
   // Build plugin
   case incompatibleTarget(String)