Skip to content

Refactor generated API post-processing #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Refactor generated API post-processing #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc8c24
Refactor post-processing
gabrielfeo Sep 5, 2024
ab27b41
Add .kotlin to .gitignore
gabrielfeo Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.gradle
.kotlin
out
!*/src/**/out

Expand Down
57 changes: 18 additions & 39 deletions build-logic/src/main/kotlin/com/gabrielfeo/task/PostProcessGeneratedApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading