From cdc8c24db714585693335b32650136e27b0ddb9a Mon Sep 17 00:00:00 2001
From: Gabriel Feo <gabriel@gabrielfeo.com>
Date: Thu, 5 Sep 2024 15:57:10 -0400
Subject: [PATCH 1/2] Refactor post-processing

---
 .../task/PostProcessGeneratedApi.kt           | 57 ++++++-------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/build-logic/src/main/kotlin/com/gabrielfeo/task/PostProcessGeneratedApi.kt b/build-logic/src/main/kotlin/com/gabrielfeo/task/PostProcessGeneratedApi.kt
index 8fc0f6cce..6a7a15f83 100644
--- a/build-logic/src/main/kotlin/com/gabrielfeo/task/PostProcessGeneratedApi.kt
+++ b/build-logic/src/main/kotlin/com/gabrielfeo/task/PostProcessGeneratedApi.kt
@@ -39,47 +39,26 @@ abstract class PostProcessGeneratedApi @Inject constructor(
 
     private fun postProcess(srcDir: File, modelsPackage: String) {
         // Replace Response<X> with X in every method return type of DevelocityApi.kt
-        ant.withGroovyBuilder {
-            "replaceregexp"(
-                "match" to ": Response<(.*?)>$",
-                "replace" to """: \1""",
-                "flags" to "gm",
-            ) {
-                "fileset"(
-                    "dir" to srcDir,
-                    "includes" to "com/gabrielfeo/develocity/api/*Api.kt",
-                )
-            }
-        }
+        replaceAll(
+            match = ": Response<(.*?)>$",
+            replace = """: \1""",
+            dir = srcDir,
+            includes = "com/gabrielfeo/develocity/api/*Api.kt",
+        )
         // Add @JvmSuppressWildcards to avoid square/retrofit#3275
-        ant.withGroovyBuilder {
-            "replaceregexp"(
-                "match" to "interface",
-                "replace" to """
-                    @JvmSuppressWildcards
-                    interface
-                """.trimIndent(),
-                "flags" to "m",
-            ) {
-                "fileset"(
-                    "dir" to srcDir,
-                    "includes" to "com/gabrielfeo/develocity/api/*Api.kt",
-                )
-            }
-        }
+        replaceAll(
+            match = "interface",
+            replace = "@JvmSuppressWildcards\ninterface",
+            dir = srcDir,
+            includes = "com/gabrielfeo/develocity/api/*Api.kt",
+        )
         // Fix mapping of BuildModelName: gradle-attributes -> gradleAttributes
-        ant.withGroovyBuilder {
-            "replaceregexp"(
-                "match" to "Minus",
-                "replace" to "",
-                "flags" to "mg",
-            ) {
-                "fileset"(
-                    "dir" to srcDir,
-                    "includes" to "com/gabrielfeo/develocity/api/model/BuildModelName.kt",
-                )
-            }
-        }
+        replaceAll(
+            match = "Minus",
+            replace = "",
+            dir = srcDir,
+            includes = "com/gabrielfeo/develocity/api/model/BuildModelName.kt",
+        )
         // Fix mapping of GradleConfigurationCacheResult.Outcome: hIT -> hit
         val file = "com/gabrielfeo/develocity/api/model/GradleConfigurationCacheResult.kt"
         replaceAll("hIT", "hit", dir = srcDir, includes = file)

From ab27b41a97ce5f4c6c261f5483e7d5c297a64eea Mon Sep 17 00:00:00 2001
From: Gabriel Feo <gabriel@gabrielfeo.com>
Date: Thu, 5 Sep 2024 15:59:32 -0400
Subject: [PATCH 2/2] Add .kotlin to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 90de942bb..07f381a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .gradle
+.kotlin
 out
 !*/src/**/out