Merge pull request #3039 from square/jwilson.0719.undeprecate

Undeprecate WireExtension.srcDir
square · Jul 19, 2024 · 4c6a17e · 4c6a17e
2 parents d707362 + 754036b
commit 4c6a17e
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WireExtension.kt b/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WireExtension.kt
@@ -311,17 +311,13 @@ open class WireExtension(
     }
 
     /** Sets a directory. Example: "src/main/proto". */
-    @Deprecated("Deprecated in favor of 'srcDir(fileCollection)'")
     fun srcDir(dir: String) {
-      isEmpty = false
-      sourceDirectoriesAndLocalJars += project.file(dir)
+      srcDir(project.file(dir))
     }
 
     /** Sets one or more directories. */
-    @Deprecated("Deprecated in favor of 'srcDir(fileCollection)'")
     fun srcDirs(vararg dirs: String) {
-      isEmpty = false
-      sourceDirectoriesAndLocalJars += dirs.map { project.file(it) }
+      srcDir(dirs.map { project.file(it) })
     }
 
     /** Sets a local or a remote jar. Examples: "libs/protos.jar", or "com.example:protos:1.0.0". */