Merge pull request #3295 from square/jwilson.0227.relative_path

Always use relative paths
square · Feb 28, 2025 · 804b292 · 804b292
2 parents c7992fe + e2a57ff
commit 804b292
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WirePlugin.kt b/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WirePlugin.kt
@@ -149,13 +149,7 @@ class WirePlugin : Plugin<Project> {
       }
 
       val targets = outputs.map { output ->
-        output.toTarget(
-          when (val out = output.out) {
-            null -> project.relativePath(source.outputDir(project))
-            project.libraryProtoOutputPath() -> project.relativePath(out)
-            else -> out
-          },
-        )
+        output.toTarget(project.relativePath(output.out ?: source.outputDir(project)))
       }
       val generatedSourcesDirectories: Set<File> =
         targets