Skip to content

Remove method from GradleUtils #15126

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
matrei merged 3 commits into from
Oct 14, 2025
Merged

Remove method from GradleUtils #15126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f88f128
fix: remove method from `GradleUtils`
matrei Oct 9, 2025
d7f98c3
Merge branch '7.0.x' into cleanup-gradleutils
matrei Oct 9, 2025
e1fa961
Merge branch '7.0.x' into cleanup-gradleutils
matrei Oct 14, 2025
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
4 changes: 0 additions & 4 deletions build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,4 @@ class GradleUtils {
static <T> T lookupProperty(Project project, String name, T defaultValue = null) {
project.findProperty(name) as T ?: defaultValue
}

static <T> T lookupPropertyByType(Project project, String name, Class<T> type) {
project.findProperty(name) as T
}
}
5 changes: 2 additions & 3 deletions build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ import java.time.format.DateTimeFormatter
import java.time.temporal.ChronoUnit

import static org.apache.grails.buildsrc.GradleUtils.lookupProperty
import static org.apache.grails.buildsrc.GradleUtils.lookupPropertyByType

@CompileStatic
class SbomPlugin implements Plugin<Project> {
Expand Down Expand Up @@ -125,8 +124,8 @@ class SbomPlugin implements Plugin<Project> {
def sbomOutputLocation = project.layout.buildDirectory.file(
project.provider {
def artifactId = lookupProperty(project, 'pomArtifactId', project.name)
def version = lookupPropertyByType(project, 'projectVersion', String)
"${artifactId}-${version}-sbom.json" as String
def version = project.findProperty('projectVersion')
"$artifactId-$version-sbom.json" as String
}
)

Expand Down
Loading