Skip to content

Commit eb2baab

Browse files
authored
Pull latest go-xcode package (#270)
* Pull latest go-xcode package * Update dependencies to the latest version
1 parent d347ed2 commit eb2baab

File tree

21 files changed

+332
-139
lines changed

21 files changed

+332
-139
lines changed

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ module github.com/bitrise-steplib/steps-xcode-archive
33
go 1.16
44

55
require (
6-
github.com/bitrise-io/go-steputils v0.0.0-20211126112149-94e32b191a27
6+
github.com/bitrise-io/go-steputils v0.0.0-20211205220451-e046db274afb
77
github.com/bitrise-io/go-utils v0.0.0-20211126092127-3a566ee3f420
8-
github.com/bitrise-io/go-xcode v0.0.0-20211202121402-4b5b548e9f63
8+
github.com/bitrise-io/go-xcode v0.0.0-20211203163621-99a08cd4c73d
99
github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8 // indirect
10-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
10+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
1111
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
1212
github.com/ryanuber/go-glob v1.0.0
1313
github.com/stretchr/testify v1.7.0
14-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
15-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
14+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
15+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
1616
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
1717
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
1818
howett.net/plist v1.0.0

go.sum

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
11
github.com/bitrise-io/go-plist v0.0.0-20210301100253-4b1a112ccd10 h1:/2OyBFI7GjYKexBPcfTPvKFz8Ks7qYzkkz2SQ8aiJgc=
22
github.com/bitrise-io/go-plist v0.0.0-20210301100253-4b1a112ccd10/go.mod h1:pARutiL3kEuRLV3JvswidvfCj+9Y3qMZtji2BDqLFsA=
33
github.com/bitrise-io/go-steputils v0.0.0-20210929162140-866a65a1e14a/go.mod h1:6Y7Dl40gwgW9YG1RAWcjFBk1u9uotuix8g2IkVTXK34=
4-
github.com/bitrise-io/go-steputils v0.0.0-20211126112149-94e32b191a27 h1:pcX4RwnJQAuDrTFYjnpd04IZZ8x+t2YHW998iPAEkxU=
5-
github.com/bitrise-io/go-steputils v0.0.0-20211126112149-94e32b191a27/go.mod h1:lx6GmEBJEga+HqquE2Wld5atUS8ZrvnvBeGrUNRXA9I=
4+
github.com/bitrise-io/go-steputils v0.0.0-20211205220451-e046db274afb h1:ZV1aWUW/fAY4kE08bwRGz0iSjfMEyHmkYn9IB/LtSMw=
5+
github.com/bitrise-io/go-steputils v0.0.0-20211205220451-e046db274afb/go.mod h1:lx6GmEBJEga+HqquE2Wld5atUS8ZrvnvBeGrUNRXA9I=
66
github.com/bitrise-io/go-utils v0.0.0-20210924090918-3e7a04d0da9d/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
77
github.com/bitrise-io/go-utils v0.0.0-20211008161027-fa11986847a0/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
88
github.com/bitrise-io/go-utils v0.0.0-20211126092127-3a566ee3f420 h1:cbKXuIhwfZzPgvuSCvEtmWxBWSk70Vivj78cOMVWgUg=
99
github.com/bitrise-io/go-utils v0.0.0-20211126092127-3a566ee3f420/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
10-
github.com/bitrise-io/go-xcode v0.0.0-20211130120921-0c07d0df0398 h1:uubL0IoTEC61+XfKPKDr28M7DJFNsQXFG3bFMxQPbBs=
11-
github.com/bitrise-io/go-xcode v0.0.0-20211130120921-0c07d0df0398/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
12-
github.com/bitrise-io/go-xcode v0.0.0-20211130130229-e18551aa3a77 h1:Bi5v6c7fu1nTeIBYa7aXHhObslC38VYdVDEDo++DER4=
13-
github.com/bitrise-io/go-xcode v0.0.0-20211130130229-e18551aa3a77/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
14-
github.com/bitrise-io/go-xcode v0.0.0-20211130140343-b3740215f0df h1:y5uGuwZywFTCg1MW+l/l7DGQ7H6Svbr50iEKtz0NQQM=
15-
github.com/bitrise-io/go-xcode v0.0.0-20211130140343-b3740215f0df/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
16-
github.com/bitrise-io/go-xcode v0.0.0-20211130140800-0e04bf217b18 h1:J0m+3T5gLcJhP9EaA3l5RbYZFb/TmfAVgsfyzAX/qUw=
17-
github.com/bitrise-io/go-xcode v0.0.0-20211130140800-0e04bf217b18/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
18-
github.com/bitrise-io/go-xcode v0.0.0-20211130141330-39774d7c1ac2 h1:DVjzPE6oRBAUPF/94ToXmLbMf1oK2qt2PkpdE2k9Au4=
19-
github.com/bitrise-io/go-xcode v0.0.0-20211130141330-39774d7c1ac2/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
20-
github.com/bitrise-io/go-xcode v0.0.0-20211201081609-81e1195a25f1 h1:ZfCvMghtSzu8NTWZ9ZruTVu4KVocwDyMvp9KCXx9bvg=
21-
github.com/bitrise-io/go-xcode v0.0.0-20211201081609-81e1195a25f1/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
22-
github.com/bitrise-io/go-xcode v0.0.0-20211201100121-9172b3a4bbe5 h1:gqPyNk3k0wd35TFS8icTaxQ8xhP83YbFPD7tybRPu6I=
23-
github.com/bitrise-io/go-xcode v0.0.0-20211201100121-9172b3a4bbe5/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
24-
github.com/bitrise-io/go-xcode v0.0.0-20211201121300-61225fc48e12 h1:d+MmW28BiGxMSaDkesAtL3PMElbTP8oHzRqSWlaTbRM=
25-
github.com/bitrise-io/go-xcode v0.0.0-20211201121300-61225fc48e12/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
26-
github.com/bitrise-io/go-xcode v0.0.0-20211202090527-ebd63a03fe34 h1:QpA9Rd2UXVcsbrlnhgKuFnxz7/E03wsYCeBojRxzaRA=
27-
github.com/bitrise-io/go-xcode v0.0.0-20211202090527-ebd63a03fe34/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
28-
github.com/bitrise-io/go-xcode v0.0.0-20211202121402-4b5b548e9f63 h1:6aM5FzyJRpRuTn9JESsmW+TNNgqScZbY4YSTw054Fi0=
29-
github.com/bitrise-io/go-xcode v0.0.0-20211202121402-4b5b548e9f63/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
10+
github.com/bitrise-io/go-xcode v0.0.0-20211203163621-99a08cd4c73d h1:YBG2HuwfQWKumkqSnYEYIqcowpMQfwLqVd/BQw+Q5XA=
11+
github.com/bitrise-io/go-xcode v0.0.0-20211203163621-99a08cd4c73d/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
3012
github.com/bitrise-io/pkcs12 v0.0.0-20210430063833-0da06eb56630/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU=
3113
github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8 h1:kmvU8AxrNTxXsVPKepBHD8W+eCVmeaKyTkRuUJB2K38=
3214
github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU=
3315
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3416
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3517
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
36-
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
37-
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
3818
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
3919
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
40-
github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
4120
github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
21+
github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
22+
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
4223
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
4324
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
4425
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -76,15 +57,15 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
7657
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
7758
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
7859
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
79-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI=
80-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
60+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8=
61+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
8162
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
8263
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
8364
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8465
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8566
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
86-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc=
87-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
67+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E=
68+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8869
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
8970
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
9071
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

main.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,19 +363,24 @@ func (s XcodeArchiveStep) createCodesignManager(config Config) (codesign.Manager
363363
IsVerboseLog: config.VerboseLog,
364364
}
365365

366-
return codesign.NewManager(
366+
project, err := projectmanager.NewProject(projectmanager.InitParams{
367+
ProjectOrWorkspacePath: config.ProjectPath,
368+
SchemeName: config.Scheme,
369+
ConfigurationName: config.Configuration,
370+
})
371+
if err != nil {
372+
return codesign.Manager{}, err
373+
}
374+
375+
return codesign.NewManagerWithProject(
367376
opts,
368377
appleAuthCredentials,
369378
serviceConnection,
370379
devPortalClientFactory,
371380
certdownloader.NewDownloader(codesignConfig.CertificatesAndPassphrases, retry.NewHTTPClient().StandardClient()),
372381
codesignasset.NewWriter(codesignConfig.Keychain),
373382
localcodesignasset.NewManager(localcodesignasset.NewProvisioningProfileProvider(), localcodesignasset.NewProvisioningProfileConverter()),
374-
projectmanager.NewFactory(projectmanager.InitParams{
375-
ProjectOrWorkspacePath: config.ProjectPath,
376-
SchemeName: config.Scheme,
377-
ConfigurationName: config.Configuration,
378-
}),
383+
project,
379384
logger,
380385
), nil
381386
}

vendor/github.com/bitrise-io/go-steputils/stepconf/strings.go

Lines changed: 9 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-xcode/autocodesign/devportalclient/appstoreconnectclient/profiles.go

Lines changed: 2 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-xcode/autocodesign/localcodesignasset/localcodesignasset.go

Lines changed: 16 additions & 2 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-xcode/autocodesign/localcodesignasset/utils.go

Lines changed: 0 additions & 5 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-xcode/codesign/archive.go

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

0 commit comments

Comments
 (0)