Skip to content
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

Gradle fix #184

Closed
wants to merge 4 commits into from
Closed

Gradle fix #184

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6588f8f
Gradle fix for spaces on commands
keeganjm-bsc Aug 17, 2023
13b3d70
go fmt
keeganjm-bsc Aug 17, 2023
c47b25e
Merge branch 'dev' into gradle-fix
keeganjm-bsc Aug 23, 2023
cf30eb2
Merge branch 'dev' into gradle-fix
keeganjm-bsc Aug 29, 2023
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
6 changes: 3 additions & 3 deletions build/gradle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (gm *GradleModule) createGradleRunConfig(gradleExecPath string) (*gradleRun
env: gm.gradleExtractorDetails.props,
gradle: gradleExecPath,
extractorPropsFile: extractorPropsFile,
tasks: strings.Join(gm.gradleExtractorDetails.tasks, " "),
tasks: gm.gradleExtractorDetails.tasks,
initScript: gm.gradleExtractorDetails.initScript,
logger: gm.containingBuild.logger,
}, nil
Expand Down Expand Up @@ -243,7 +243,7 @@ func GetGradleExecPath(useWrapper bool) (string, error) {
type gradleRunConfig struct {
gradle string
extractorPropsFile string
tasks string
tasks []string
initScript string
env map[string]string
logger utils.Log
Expand All @@ -255,7 +255,7 @@ func (config *gradleRunConfig) GetCmd() *exec.Cmd {
if config.initScript != "" {
cmd = append(cmd, "--init-script", config.initScript)
}
cmd = append(cmd, strings.Split(config.tasks, " ")...)
cmd = append(cmd, config.tasks...)
config.logger.Info("Running gradle command:", strings.Join(cmd, " "))
return exec.Command(cmd[0], cmd[1:]...)
}
Expand Down