Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/bitrise-io/go-utils v1.0.14
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23
github.com/bitrise-io/go-xcode v1.3.0
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.56
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.57.0.20250515110640-76a2cfe0d18b
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/stretchr/testify v1.10.0
gopkg.in/yaml.v3 v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23 h1:Dfh4nyZPuEtilBisidejqxBrkx9
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23/go.mod h1:3XUplo0dOWc3DqT2XA2SeHToDSg7+j1y1HTHibT2H68=
github.com/bitrise-io/go-xcode v1.3.0 h1:QB8Vyr2oZQro/ocs9DJai80rlYL1hU1kwjHqdGslFLo=
github.com/bitrise-io/go-xcode v1.3.0/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.56 h1:JSwOStu6HCkT6b7icTQ3x/0OBNPQ8mD7Q6vQt2hG7fg=
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.56/go.mod h1:zoLzT5fJE8V2SeYq0D0Z+ZN2FAzERjV3uiqDg5H8Bug=
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.57.0.20250515110640-76a2cfe0d18b h1:cnA17k+z1y9M8r7+iHOeBkfL2ha0drt7g/Wh4JhzEtQ=
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.57.0.20250515110640-76a2cfe0d18b/go.mod h1:zoLzT5fJE8V2SeYq0D0Z+ZN2FAzERjV3uiqDg5H8Bug=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down
28 changes: 18 additions & 10 deletions step/step.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"strings"
"time"

"howett.net/plist"

"github.com/bitrise-io/go-steputils/v2/stepconf"
v1command "github.com/bitrise-io/go-utils/command"
v1fileutil "github.com/bitrise-io/go-utils/fileutil"
Expand Down Expand Up @@ -36,7 +38,6 @@ import (
"github.com/bitrise-io/go-xcode/xcarchive"
"github.com/bitrise-io/go-xcode/xcodebuild"
"github.com/kballard/go-shellquote"
"howett.net/plist"
)

const (
Expand Down Expand Up @@ -994,22 +995,29 @@ func (s XcodebuildArchiver) xcodeIPAExport(opts xcodeIPAExportOpts) (xcodeIPAExp

s.logger.TPrintf("Opening Xcode project at path: %s.", opts.ProjectPath)

xcodeProj, scheme, configuration, err := OpenArchivableProject(opts.ProjectPath, opts.Scheme, opts.Configuration)
if err != nil {
return out, fmt.Errorf("failed to open project: %s: %s", opts.ProjectPath, err)
}

archiveCodeSignIsXcodeManaged := opts.Archive.IsXcodeManaged()
signingStyle := exportoptions.SigningStyleManual
if opts.XcodeAuthOptions != nil {
signingStyle = exportoptions.SigningStyleAutomatic
}

generator := exportoptionsgenerator.New(xcodeProj, scheme, configuration, s.xcodeVersionReader, s.logger)
exportOptions, err := generator.GenerateApplicationExportOptions(exportMethod, opts.ICloudContainerEnvironment, opts.ExportDevelopmentTeam,
opts.UploadBitcode, opts.CompileBitcode, archiveCodeSignIsXcodeManaged, signingStyle, opts.TestFlightInternalTestingOnly)
archiveInfo, err := exportoptionsgenerator.ReadArchiveExportInfo(opts.Archive)
if err != nil {
return out, err
return out, fmt.Errorf("failed to read xcarchive: %s", err)
}

generator := exportoptionsgenerator.New(s.xcodeVersionReader, s.logger)
exportOptions, err := generator.GenerateApplicationExportOptions(exportoptionsgenerator.ExportProductApp, archiveInfo, exportMethod, signingStyle, exportoptionsgenerator.Opts{
ContainerEnvironment: opts.ICloudContainerEnvironment,
TeamID: opts.ExportDevelopmentTeam,
UploadBitcode: opts.UploadBitcode,
CompileBitcode: opts.CompileBitcode,
ArchivedWithXcodeManagedProfiles: archiveCodeSignIsXcodeManaged,
TestFlightInternalTestingOnly: opts.TestFlightInternalTestingOnly,
ManageVersionAndBuildNumber: false,
})
if err != nil {
return out, fmt.Errorf("failed to generate xcode export options: %s", err)
}

s.logger.Println()
Expand Down

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

37 changes: 0 additions & 37 deletions vendor/github.com/bitrise-io/go-xcode/v2/codesign/archive.go

This file was deleted.

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.

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

Loading