Skip to content

Commit

Permalink
Update go-steputils for asdf support (#87)
Browse files Browse the repository at this point in the history
Co-authored-by: Krisztián Gödrei <[email protected]>
  • Loading branch information
hisaac and godrei authored Nov 1, 2022
1 parent a91f0c6 commit efd844d
Show file tree
Hide file tree
Showing 63 changed files with 2,155 additions and 936 deletions.
10 changes: 5 additions & 5 deletions cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"strings"

"github.com/bitrise-io/bitrise-init/scanners/android"
androidCache "github.com/bitrise-io/go-android/cache"
androidCache "github.com/bitrise-io/go-android/v2/cache"
"github.com/bitrise-io/go-steputils/cache"
"github.com/bitrise-io/go-utils/command"
"github.com/bitrise-io/go-utils/env"
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/go-utils/pathutil"
"github.com/bitrise-io/go-utils/v2/command"
"github.com/bitrise-io/go-utils/v2/env"
)

type depsFunc func(dir string) ([]string, []string, error)
Expand Down Expand Up @@ -80,8 +80,8 @@ func androidDeps(dir string) ([]string, []string, error) {

var include []string
var exclude []string
for _, dir := range scanner.ProjectRoots {
i, e, err := androidCache.NewAndroidGradleCacheItemCollector(command.NewFactory(env.NewRepository())).Collect(dir, cache.LevelDeps)
for _, project := range scanner.Projects {
i, e, err := androidCache.NewAndroidGradleCacheItemCollector(command.NewFactory(env.NewRepository())).Collect(project.RelPath, cache.LevelDeps)
if err != nil {
return nil, nil, err
}
Expand Down
26 changes: 20 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
module github.com/bitrise-io/steps-fastlane

go 1.12
go 1.18

require (
github.com/bitrise-io/bitrise-init v0.0.0-20210520122036-d213de321eb8
github.com/bitrise-io/go-android v0.0.0-20210913151943-e1ea0b4df36d
github.com/bitrise-io/go-steputils v0.0.0-20210924114124-851d30b88892
github.com/bitrise-io/go-utils v0.0.0-20210924090918-3e7a04d0da9d
github.com/bitrise-io/go-xcode v0.0.0-20210521101355-fb6a1eb6e05b
github.com/bitrise-io/bitrise-init v0.0.0-20220504131857-f00a24c7c8ba
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.3
github.com/bitrise-io/go-steputils v1.0.2
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.8
github.com/bitrise-io/go-utils v1.0.2
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.8
github.com/bitrise-io/go-xcode v1.0.9
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
)

require (
github.com/beevik/etree v1.1.0 // indirect
github.com/bitrise-io/bitrise v0.0.0-20220719135434-7f794d69d858 // indirect
github.com/bitrise-io/envman v0.0.0-20220512153504-166d59151b78 // indirect
github.com/bitrise-io/stepman v0.0.0-20220718172049-e5ae0a09c2f2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
119 changes: 74 additions & 45 deletions go.sum

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (

"github.com/bitrise-io/go-steputils/cache"
"github.com/bitrise-io/go-steputils/command/gems"
"github.com/bitrise-io/go-steputils/ruby"
"github.com/bitrise-io/go-steputils/stepconf"
"github.com/bitrise-io/go-utils/command"
"github.com/bitrise-io/go-utils/env"
"github.com/bitrise-io/go-steputils/v2/ruby"
"github.com/bitrise-io/go-utils/errorutil"
"github.com/bitrise-io/go-utils/fileutil"
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/go-utils/pathutil"
"github.com/bitrise-io/go-utils/retry"
"github.com/bitrise-io/go-utils/v2/command"
"github.com/bitrise-io/go-utils/v2/env"
"github.com/bitrise-io/go-xcode/appleauth"
"github.com/bitrise-io/go-xcode/devportalservice"
"github.com/kballard/go-shellquote"
Expand Down Expand Up @@ -103,9 +103,9 @@ func fastlaneDebugInfo(workDir string, useBundler bool, bundlerVersion gems.Vers
log.Debugf("$ %s", cmd.PrintableCommandArgs())
if err := cmd.Run(); err != nil {
if errorutil.IsExitStatusError(err) {
return "", fmt.Errorf("Fastlane command (%s) failed, output: %s", cmd.PrintableCommandArgs(), outBuffer.String())
return "", fmt.Errorf("fastlane command (%s) failed, output: %s", cmd.PrintableCommandArgs(), outBuffer.String())
}
return "", fmt.Errorf("Fastlane command (%s) failed: %v", cmd.PrintableCommandArgs(), err)
return "", fmt.Errorf("fastlane command (%s) failed: %v", cmd.PrintableCommandArgs(), err)
}

return outBuffer.String(), nil
Expand Down Expand Up @@ -138,7 +138,7 @@ func handleSessionDataError(err error) {

func main() {
var config Config
parser := stepconf.NewInputParser(env.NewRepository())
parser := stepconf.NewDefaultEnvParser()
if err := parser.Parse(&config); err != nil {
failf("Issue with input: %s", err)
}
Expand Down Expand Up @@ -208,7 +208,7 @@ func main() {
}
}

// Select and fetch Apple authenication source
// Select and fetch Apple authentication source
var devportalConnectionProvider *devportalservice.BitriseClient
if config.BuildURL != "" && config.BuildAPIToken != "" {
devportalConnectionProvider = devportalservice.NewBitriseClient(retry.NewHTTPClient().StandardClient(), config.BuildURL, string(config.BuildAPIToken))
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

110 changes: 80 additions & 30 deletions vendor/github.com/bitrise-io/bitrise-init/scanners/android/android.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 10 additions & 28 deletions vendor/github.com/bitrise-io/bitrise-init/scanners/android/const.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit efd844d

Please sign in to comment.