Skip to content

Commit

Permalink
Step 822 update appleauth and devportalservice (#78)
Browse files Browse the repository at this point in the history
* Appleauth and devportalservice packages are moved to go-xcode.

* Migrate to go-android/cache package.

* Update go dependencies.
  • Loading branch information
godrei authored May 18, 2021
1 parent 4e075c9 commit 7112e6c
Show file tree
Hide file tree
Showing 48 changed files with 2,676 additions and 487 deletions.
5 changes: 3 additions & 2 deletions cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (

"github.com/bitrise-io/bitrise-init/scanners/android"
"github.com/bitrise-io/bitrise-init/utility"
androidCache "github.com/bitrise-io/go-android/cache"
"github.com/bitrise-io/go-steputils/cache"
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/go-utils/pathutil"
androidCache "github.com/bitrise-steplib/bitrise-step-android-unit-test/cache"
)

type depsFunc func(dir string) ([]string, []string, error)
Expand Down Expand Up @@ -79,7 +80,7 @@ func androidDeps(dir string) ([]string, []string, error) {
var include []string
var exclude []string
for _, dir := range scanner.ProjectRoots {
i, e, err := androidCache.Deps(dir, androidCache.LevelDeps)
i, e, err := androidCache.NewAndroidGradleCacheItemCollector().Collect(dir, cache.LevelDeps)
if err != nil {
return nil, nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"

"github.com/bitrise-io/go-utils/pathutil"
"github.com/bitrise-steplib/steps-deploy-to-itunesconnect-deliver/appleauth"
"github.com/bitrise-io/go-xcode/appleauth"
)

// fastlaneAPIKey is used to serialize App Store Connect API Key into JSON for fastlane
Expand Down
19 changes: 6 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,11 @@ module github.com/bitrise-io/steps-fastlane
go 1.12

require (
github.com/beevik/etree v1.1.0 // indirect
github.com/bitrise-io/bitrise v0.0.0-20190829132137-518e23eca82d // indirect
github.com/bitrise-io/bitrise-init v0.0.0-20190813135927-7ff42ba329cb
github.com/bitrise-io/envman v0.0.0-20190813133714-27a300a1ed43 // indirect
github.com/bitrise-io/go-steputils v0.0.0-20210505101226-8536c460c5c1
github.com/bitrise-io/go-utils v0.0.0-20210505091801-98b7dc39ee61
github.com/bitrise-io/stepman v0.0.0-20190813144014-10564a4888a6 // indirect
github.com/bitrise-steplib/bitrise-step-android-unit-test v0.0.0-20190902203028-ff8e682d8645
github.com/bitrise-steplib/steps-deploy-to-itunesconnect-deliver v0.0.0-20210225084122-4a4d9384c633
github.com/google/go-cmp v0.5.4 // indirect
github.com/bitrise-io/bitrise v0.0.0-20210513161711-09b1442cf3e0 // indirect
github.com/bitrise-io/bitrise-init v0.0.0-20210512085703-71cb279cf605
github.com/bitrise-io/go-android v0.0.0-20210517091621-72f0eb7a5197
github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77
github.com/bitrise-io/go-utils v0.0.0-20210514133945-9dd14e1c514a
github.com/bitrise-io/go-xcode v0.0.0-20210512084902-047d3c3d372a
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/kr/pretty v0.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
)
116 changes: 82 additions & 34 deletions go.sum

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
"strings"

"github.com/bitrise-io/go-steputils/cache"
"github.com/bitrise-io/go-steputils/stepconf"
"github.com/bitrise-io/go-utils/command"
"github.com/bitrise-io/go-steputils/command/gems"
"github.com/bitrise-io/go-steputils/command/rubycommand"
"github.com/bitrise-io/go-steputils/stepconf"
"github.com/bitrise-io/go-utils/command"
"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-steplib/steps-deploy-to-itunesconnect-deliver/appleauth"
"github.com/bitrise-steplib/steps-deploy-to-itunesconnect-deliver/devportalservice"
"github.com/bitrise-io/go-xcode/appleauth"
"github.com/bitrise-io/go-xcode/devportalservice"
"github.com/kballard/go-shellquote"
)

Expand Down

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

41 changes: 41 additions & 0 deletions vendor/github.com/bitrise-io/bitrise-init/analytics/analytics.go

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

39 changes: 27 additions & 12 deletions vendor/github.com/bitrise-io/bitrise-init/models/models.go

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

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

23 changes: 10 additions & 13 deletions vendor/github.com/bitrise-io/bitrise-init/scanners/android/icon.go

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

Loading

0 comments on commit 7112e6c

Please sign in to comment.