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

Jump to bottom

Gradle args with spaces fail the command execution #830

Closed
wants to merge 10 commits into from
Closed

Gradle args with spaces fail the command execution #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc96d7b
Bugfix - Gradle args with spaces
keeganjm-bsc Jun 19, 2023
34a17d8
Bugfix - Gradle args with spaces - modifying utils
keeganjm-bsc Jun 19, 2023
f4a5611
Bugfix - Gradle args with spaces - updating tasks
keeganjm-bsc Jun 19, 2023
ccb9e11
Merge branch 'dev' into gradle-args-with-spaces-1
keeganjm-bsc Jun 21, 2023
0e927f7
Merge branch 'dev' into gradle-args-with-spaces-1
keeganjm-bsc Jun 26, 2023
09227e7
Merge branch 'dev' into gradle-args-with-spaces-1
keeganjm-bsc Jun 26, 2023
564c999
Merge branch 'dev' into gradle-args-with-spaces-1
keeganjm-bsc Jun 27, 2023
28f90a7
removing unused import
keeganjm-bsc Jun 27, 2023
1315058
Merge branch 'dev' into gradle-args-with-spaces-1
keeganjm-bsc Jun 27, 2023
81f6faf
Merge branch 'dev' into gradle-args-with-spaces-1
eyalbe4 Jul 19, 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
4 changes: 2 additions & 2 deletions artifactory/commands/gradle/gradle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

type GradleCommand struct {
tasks string
tasks []string
configPath string
configuration *utils.BuildConfiguration
serverDetails *config.ServerDetails
Expand Down Expand Up @@ -179,7 +179,7 @@ func (gc *GradleCommand) SetConfigPath(configPath string) *GradleCommand {
return gc
}

func (gc *GradleCommand) SetTasks(tasks string) *GradleCommand {
func (gc *GradleCommand) SetTasks(tasks []string) *GradleCommand {
gc.tasks = tasks
return gc
}
Expand Down
5 changes: 2 additions & 3 deletions utils/gradle/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package gradleutils
import (
"fmt"
"path/filepath"
"strings"

"github.com/jfrog/build-info-go/build"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
Expand All @@ -18,7 +17,7 @@ const (
useWrapper = "usewrapper"
)

func RunGradle(vConfig *viper.Viper, tasks, deployableArtifactsFile string, configuration *utils.BuildConfiguration, threads int, disableDeploy bool) error {
func RunGradle(vConfig *viper.Viper, tasks []string, deployableArtifactsFile string, configuration *utils.BuildConfiguration, threads int, disableDeploy bool) error {
buildInfoService := utils.CreateBuildInfoService()
buildName, err := configuration.GetBuildName()
if err != nil {
Expand All @@ -44,7 +43,7 @@ func RunGradle(vConfig *viper.Viper, tasks, deployableArtifactsFile string, conf
if err != nil {
return err
}
gradleModule.SetExtractorDetails(dependencyLocalPath, filepath.Join(coreutils.GetCliPersistentTempDirPath(), utils.PropertiesTempPath), strings.Split(tasks, " "), wrapper, plugin, utils.DownloadExtractor, props)
gradleModule.SetExtractorDetails(dependencyLocalPath, filepath.Join(coreutils.GetCliPersistentTempDirPath(), utils.PropertiesTempPath), tasks, wrapper, plugin, utils.DownloadExtractor, props)
return coreutils.ConvertExitCodeError(gradleModule.CalcDependencies())
}

Expand Down