Skip to content

Commit 63b4b07

Browse files
authored
Fix 'module not found' error with custom args (#33)
* update dep * dep update * Removed debug only logs
1 parent 6d612b1 commit 63b4b07

File tree

9 files changed

+59
-80
lines changed

9 files changed

+59
-80
lines changed

e2e/bitrise.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ workflows:
4040
- path::./:
4141
title: Test simple android project
4242
inputs:
43-
- arguments: --info
43+
- arguments: --debug
44+
- module: app
45+
- variant: Debug
4446
- change-workdir:
4547
title: cd $ORIG_BITRISE_SOURCE_DIR/_tmp/mono_repo
4648
run_if: true

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/bitrise-steplib/bitrise-step-android-lint
33
go 1.22
44

55
require (
6-
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.12
6+
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.14
77
github.com/bitrise-io/go-steputils v1.0.6
88
github.com/bitrise-io/go-utils v1.0.15
9-
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.30
9+
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.33
1010
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
1111
)
1212

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.12 h1:vtCxBRspJoOlAeg7dlibfVwumGjn5PUImsNxoMBamkI=
2-
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.12/go.mod h1:Za69CvctGxHS3HBHvmxGmESTBqMEs/lyjsMM8rJ5lAQ=
1+
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.14 h1:OJKv7EANz7NCzjz4MxYqVRYgZea4DDyTaXIAlIkwDGY=
2+
github.com/bitrise-io/go-android/v2 v2.0.0-alpha.14/go.mod h1:Za69CvctGxHS3HBHvmxGmESTBqMEs/lyjsMM8rJ5lAQ=
33
github.com/bitrise-io/go-steputils v1.0.6 h1:eBRL70DWwEd7DWYGd5Ds7OSIY5HElzhoDOI6UuITKQg=
44
github.com/bitrise-io/go-steputils v1.0.6/go.mod h1:YIUaQnIAyK4pCvQG0hYHVkSzKNT9uL2FWmkFNW4mfNI=
55
github.com/bitrise-io/go-utils v1.0.1/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY=
66
github.com/bitrise-io/go-utils v1.0.15 h1:KRQjNiPrkxBRM6G5fQy05v0p0r8wycWfKVb+Ko+Vtg0=
77
github.com/bitrise-io/go-utils v1.0.15/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY=
8-
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.30 h1:cnDum7KV3jBUaDtCw3csyKGImKLlOg98Ixb94veSe0c=
9-
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.30/go.mod h1:3XUplo0dOWc3DqT2XA2SeHToDSg7+j1y1HTHibT2H68=
8+
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.33 h1:2Skyp4yg8aNKLr5GB5amM9UK9n1yzIMT88Rb/ZBz8m4=
9+
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.33/go.mod h1:3XUplo0dOWc3DqT2XA2SeHToDSg7+j1y1HTHibT2H68=
1010
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1111
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1212
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

main.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"os"
66
"path/filepath"
7+
"slices"
78
"strings"
89
"time"
910

@@ -12,7 +13,6 @@ import (
1213
utilscache "github.com/bitrise-io/go-steputils/cache"
1314
"github.com/bitrise-io/go-steputils/stepconf"
1415
"github.com/bitrise-io/go-utils/pathutil"
15-
"github.com/bitrise-io/go-utils/sliceutil"
1616
"github.com/bitrise-io/go-utils/v2/command"
1717
"github.com/bitrise-io/go-utils/v2/env"
1818
"github.com/bitrise-io/go-utils/v2/log"
@@ -78,35 +78,35 @@ func filterVariants(module, variant string, variantsMap gradle.Variants) (gradle
7878
}
7979

8080
func mainE(config Config, cmdFactory command.Factory, logger log.Logger) error {
81-
gradleProject, err := gradle.NewProject(config.ProjectLocation, cmdFactory)
81+
gradleProject, err := gradle.NewProject(config.ProjectLocation, cmdFactory, logger)
8282
if err != nil {
83-
return fmt.Errorf("Process config: failed to open project, error: %s", err)
83+
return fmt.Errorf("Process config: failed to open project: %s", err)
8484
}
8585

8686
lintTask := gradleProject.GetTask("lint")
8787

8888
args, err := shellquote.Split(config.Arguments)
8989
if err != nil {
90-
return fmt.Errorf("Process config: failed to parse arguments, error: %s", err)
90+
return fmt.Errorf("Process config: failed to parse arguments: %s", err)
9191
}
9292

9393
logger.Infof("Variants:")
9494
fmt.Println()
9595

9696
variants, err := lintTask.GetVariants(args...)
9797
if err != nil {
98-
return fmt.Errorf("Run: failed to fetch variants, error: %s", err)
98+
return fmt.Errorf("Run: failed to fetch variants: %s", err)
9999
}
100100

101101
filteredVariants, err := filterVariants(config.Module, config.Variant, variants)
102102
if err != nil {
103-
failf("Process config: failed to find buildable variants, error: %s", err)
103+
failf("Process config: failed to find buildable variants: %s", err)
104104
}
105105

106106
for module, variants := range variants {
107107
logger.Printf("%s:", module)
108108
for _, variant := range variants {
109-
if sliceutil.IsStringInSlice(variant, filteredVariants[module]) {
109+
if slices.Contains(filteredVariants[module], variant) {
110110
logger.Donef("✓ %s", strings.TrimSuffix(variant, "UnitTest"))
111111
continue
112112
}
@@ -126,7 +126,7 @@ func mainE(config Config, cmdFactory command.Factory, logger log.Logger) error {
126126

127127
taskError := lintCommand.Run()
128128
if taskError != nil {
129-
logger.Errorf("Run: lint task failed, error: %v", taskError)
129+
logger.Errorf("Run: lint task failed: %v", taskError)
130130
}
131131
fmt.Println()
132132

@@ -135,7 +135,7 @@ func mainE(config Config, cmdFactory command.Factory, logger log.Logger) error {
135135

136136
artifacts, err := getArtifacts(gradleProject, started, config.ReportPathPattern)
137137
if err != nil {
138-
return fmt.Errorf("Export outputs: failed to find artifacts, error: %v", err)
138+
return fmt.Errorf("Export outputs: failed to find artifacts: %v", err)
139139
}
140140

141141
if len(artifacts) > 0 {
@@ -144,7 +144,7 @@ func mainE(config Config, cmdFactory command.Factory, logger log.Logger) error {
144144
filepath.Join(config.DeployDir, artifact.Name),
145145
)
146146
if err != nil {
147-
return fmt.Errorf("Export outputs: failed to check path, error: %v", err)
147+
return fmt.Errorf("Export outputs: failed to check path: %v", err)
148148
}
149149

150150
artifactName := filepath.Base(artifact.Path)

vendor/github.com/bitrise-io/go-android/v2/gradle/project.go

Lines changed: 13 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/bitrise-io/go-android/v2/gradle/task.go

Lines changed: 19 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/bitrise-io/go-utils/sliceutil/sliceutil.go

Lines changed: 0 additions & 46 deletions
This file was deleted.

vendor/github.com/bitrise-io/go-utils/v2/log/log.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# github.com/bitrise-io/go-android/v2 v2.0.0-alpha.12
1+
# github.com/bitrise-io/go-android/v2 v2.0.0-alpha.14
22
## explicit; go 1.22
33
github.com/bitrise-io/go-android/v2/cache
44
github.com/bitrise-io/go-android/v2/gradle
@@ -17,9 +17,8 @@ github.com/bitrise-io/go-utils/log
1717
github.com/bitrise-io/go-utils/parseutil
1818
github.com/bitrise-io/go-utils/pathutil
1919
github.com/bitrise-io/go-utils/pointers
20-
github.com/bitrise-io/go-utils/sliceutil
2120
github.com/bitrise-io/go-utils/ziputil
22-
# github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.30
21+
# github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.33
2322
## explicit; go 1.17
2423
github.com/bitrise-io/go-utils/v2/command
2524
github.com/bitrise-io/go-utils/v2/env

0 commit comments

Comments
 (0)