Fix profile create (#379)

* Update go-xcode to pull profile create request fix

* Update go-xcode

* Wire in the new exportOptionsGenerator

* Update go-xcode

* Code cleanup

Author: godrei

go.mod

@@ -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.58
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/stretchr/testify v1.10.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -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.58 h1:99BVtam/ViO6DrVLwzfPcWuAeWJhOLPF7LMJ9xmBtMw=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.58/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=

step/step.go

@@ -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"
@@ -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 (
@@ -446,9 +447,6 @@ func (s XcodebuildArchiver) Run(opts RunOpts) (RunResult, error) {
 	out.Archive = archiveOut.Archive
 
 	IPAExportOpts := xcodeIPAExportOpts{
-		ProjectPath:       opts.ProjectPath,
-		Scheme:            opts.Scheme,
-		Configuration:     opts.Configuration,
 		XcodeMajorVersion: opts.XcodeMajorVersion,
 		XcodeAuthOptions:  authOptions,
 
@@ -921,9 +919,6 @@ and use 'Export iOS and tvOS Xcode archive' step to export an App Clip.`, opts.S
 }
 
 type xcodeIPAExportOpts struct {
-	ProjectPath       string
-	Scheme            string
-	Configuration     string
 	XcodeMajorVersion int
 	XcodeAuthOptions  *xcodebuild.AuthenticationParams
 
@@ -992,24 +987,29 @@ func (s XcodebuildArchiver) xcodeIPAExport(opts xcodeIPAExportOpts) (xcodeIPAExp
 			return out, err
 		}
 
-		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()