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

Support Gradle args with spaces #848

Closed
wants to merge 7 commits into from
+24 −4
Closed

Support Gradle args with spaces #848

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
300517a
Bug fix: gradle args with spaces
keeganjm-bsc Jun 27, 2023
c1fdfbf
Merge branch 'dev' into bug/gradle-args-with-spaces-1
keeganjm-bsc Jun 27, 2023
c63231e
Merge branch 'dev' into bug/gradle-args-with-spaces-1
yahavi Jun 30, 2023
03601dc
way for space to be include in values for sys properties in gradle
keeganjm-bsc Jun 30, 2023
6f7b911
adding additional change for gradle opts
keeganjm-bsc Aug 6, 2023
538b6e1
Merge branch 'dev' into bug/gradle-args-with-spaces-1
keeganjm-bsc Aug 6, 2023
d210c1a
Merge branch 'dev' into bug/gradle-args-with-spaces-1
keeganjm-bsc Aug 15, 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