Use Converter from go-xcode (#274)

* refact: STEP-2230 Use Converter from go-xcode

- Remove dependency on steps-deploy-to-bitrise-io
- Depend on go-xcode and go-steputils instead.

* chore: upgrade dependencies to released versions

* fix: follow API change in export.NewExporter

It now requires an explicit FileManager in constructor. Providing it.

---------

Co-authored-by: Gergely Sallai <1516628+gergely-sallai@users.noreply.github.com>

Author: gergely-sallai

go.mod

@@ -6,11 +6,10 @@ toolchain go1.23.2
 
 require (
 	github.com/bitrise-io/bitrise v0.0.0-20230707121919-a5b9e2d27ea9
-	github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.43
+	github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.49
 	github.com/bitrise-io/go-utils v1.0.15
-	github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.31
-	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.77
-	github.com/bitrise-steplib/steps-deploy-to-bitrise-io v0.0.0-20260105124642-5583d1ed06c4
+	github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.34
+	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.80
 	github.com/hashicorp/go-version v1.7.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/stretchr/testify v1.10.0
@@ -19,10 +18,11 @@ require (
 require (
 	github.com/bitrise-io/envman v0.0.0-20240730123632-8066eeb61599 // indirect
 	github.com/bitrise-io/go-steputils v1.0.6 // indirect
-	github.com/bitrise-io/go-xcode v1.3.1 // indirect
+	github.com/bitrise-io/go-xcode v1.3.3 // indirect
 	github.com/bitrise-io/stepman v0.0.0-20240828074035-6ae1a5f5efde // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/globocom/go-buffer/v2 v2.0.0 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/kr/pretty v0.3.1 // indirect

go.sum

@@ -4,21 +4,19 @@ github.com/bitrise-io/envman v0.0.0-20240730123632-8066eeb61599 h1:UaudsJR8LbzL7
 github.com/bitrise-io/envman v0.0.0-20240730123632-8066eeb61599/go.mod h1:7yJQdVdq8BxJYq2xjG0yViQf/aspJLJ/xqk/OnP6lGE=
 github.com/bitrise-io/go-steputils v1.0.6 h1:eBRL70DWwEd7DWYGd5Ds7OSIY5HElzhoDOI6UuITKQg=
 github.com/bitrise-io/go-steputils v1.0.6/go.mod h1:YIUaQnIAyK4pCvQG0hYHVkSzKNT9uL2FWmkFNW4mfNI=
-github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.43 h1:oahoCL46PPywHRBin54zrwDOhXlMPIXx6zdo1Hgkz1g=
-github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.43/go.mod h1:SjWTgoD5wDyyIa+xPrA+U2UgL9K8Lx/xuLaK5LBCjXE=
+github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.49 h1:2rGTx64qvdr6hseqMUwV3p1glEzrJ6lbTYxs5LfMEfU=
+github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.49/go.mod h1:hK2zMovlJg7+FLdJDQx2GV/2dB/WqErBGLKPPF42oOo=
 github.com/bitrise-io/go-utils v1.0.1/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY=
 github.com/bitrise-io/go-utils v1.0.15 h1:KRQjNiPrkxBRM6G5fQy05v0p0r8wycWfKVb+Ko+Vtg0=
 github.com/bitrise-io/go-utils v1.0.15/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY=
-github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.31 h1:Lay9mco4/T88oYY+kqZlpdWeU9aj32/qWMRwcTg812o=
-github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.31/go.mod h1:3XUplo0dOWc3DqT2XA2SeHToDSg7+j1y1HTHibT2H68=
-github.com/bitrise-io/go-xcode v1.3.1 h1:ioLPHQ+XnSafCpnFJl+d9+qdfIr0Z55yQRlEA66/XxI=
-github.com/bitrise-io/go-xcode v1.3.1/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.77 h1:GEE6KeA6Z/kmfoTWR+rOFvMLiH5cu7x3E+TBkmL1UtY=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.77/go.mod h1:66PiZrCN9O6f3ELTDx4clAQ8R0PglohhbE1sdfd1vP0=
+github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.34 h1:xsLfhItfs4SCCAesbv7UtKpldNqievDvtHggSuBI2+w=
+github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.34/go.mod h1:5Z/vkUZ2BIY7IAVlMGns3ypRjd+J872YBSCJaLWVo/U=
+github.com/bitrise-io/go-xcode v1.3.3 h1:aYkSMWP+1/n2ZabRy3OMfeaWmE4l1gAPq63azx06LIw=
+github.com/bitrise-io/go-xcode v1.3.3/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.80 h1:/pq5C8nvn71HSsGyqhv76XcEgM/XZpYwMvBl4R+OczQ=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.80/go.mod h1:YspByJ93D3uuDoCMCw0BZLT6rl77YUohOb4b+lBaMTQ=
 github.com/bitrise-io/stepman v0.0.0-20240828074035-6ae1a5f5efde h1:LinFhZG5OdayDh1T1JO8QANsNwQWzqORZ0A9EGHQ0ps=
 github.com/bitrise-io/stepman v0.0.0-20240828074035-6ae1a5f5efde/go.mod h1:Lq9nEqKerBD35w3eSU8lf83F7uZPkXfmRSZEUDJN40w=
-github.com/bitrise-steplib/steps-deploy-to-bitrise-io v0.0.0-20260105124642-5583d1ed06c4 h1:neZDzBK4EbeNw8644E5cPP9eWHsAQpJ13GtYj38hBWI=
-github.com/bitrise-steplib/steps-deploy-to-bitrise-io v0.0.0-20260105124642-5583d1ed06c4/go.mod h1:QYe/+OmcrDmON6wsW/yju0F1UOL+L8UBJt+eeYtUfCw=
 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=

main.go

@@ -89,7 +89,7 @@ func createStep(logger log.Logger, logFormatter string) (step.XcodeTestRunner, e
 	xcconfigWriter := xcconfig.NewWriter(pathProvider, fileManager, pathChecker, pathModifier)
 	simulatorManager := simulator.NewManager(logger, commandFactory)
 	swiftCache := cache.NewSwiftPackageCache()
-	outputExporter := export.NewExporter(commandFactory)
+	outputExporter := export.NewExporter(commandFactory, fileManager)
 	testAddonExporter := testaddon.NewExporter(testaddon.NewTestAddon(logger))
 	stepenvRepository := stepenv.NewRepository(envRepository)
 	exporter := output.NewExporter(stepenvRepository, logger, outputExporter, testAddonExporter)

xcodebuild/mocks/FileManager.go mocks/FileManager.goxcodebuild/mocks/FileManager.go renamed to mocks/FileManager.go

@@ -10,8 +10,8 @@ import (
 	"github.com/bitrise-io/go-utils/v2/env"
 	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/bitrise-io/go-utils/ziputil"
-	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/converters/xcresult3"
-	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/converters/xcresult3/model3"
+	"github.com/bitrise-io/go-xcode/v2/testresult/xcresult3"
+	"github.com/bitrise-io/go-xcode/v2/testresult/xcresult3/model3"
 	"github.com/bitrise-steplib/steps-xcode-test/testaddon"
 )
 
@@ -143,8 +143,7 @@ func (e exporter) ExportFlakyTestCases(xcResultPath string, useOldXCResultExtrac
 }
 
 func (e exporter) parseTestSummary(xcResultPath string, useOldXCResultExtractionMethod bool) (*model3.TestSummary, error) {
-	converter := xcresult3.Converter{}
-	converter.Setup(useOldXCResultExtractionMethod)
+	converter := xcresult3.NewConverter(useOldXCResultExtractionMethod)
 	if !converter.Detect([]string{xcResultPath}) {
 		return nil, nil
 	}

output/output.go

@@ -11,7 +11,7 @@ import (
 	"github.com/bitrise-io/go-utils/v2/fileutil"
 	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/bitrise-io/go-utils/v2/pathutil"
-	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/converters/xcresult3/model3"
+	"github.com/bitrise-io/go-xcode/v2/testresult/xcresult3/model3"
 	commonMocks "github.com/bitrise-steplib/steps-xcode-test/mocks"
 	"github.com/bitrise-steplib/steps-xcode-test/output/mocks"
 	"github.com/stretchr/testify/assert"
@@ -281,7 +281,7 @@ func Test_exporter_collectAndExportFlakyTestPlans(t *testing.T) {
 			exporter := exporter{
 				envRepository:     envRepository,
 				logger:            logger,
-				outputExporter:    export.NewExporter(new(commonMocks.CommandFactory)),
+				outputExporter:    export.NewExporter(new(commonMocks.CommandFactory), new(commonMocks.FileManager)),
 				testAddonExporter: nil,
 			}
 
@@ -312,10 +312,11 @@ func Test_exporter_collectAndExportFlakyTestPlans(t *testing.T) {
 
 func createSutAndMocks() (Exporter, testingMocks) {
 	commandFactory := new(commonMocks.CommandFactory)
+	fileManager := new(commonMocks.FileManager)
 	envRepository := new(mocks.Repository)
 	envRepository.On("Set", mock.Anything, mock.Anything).Return(nil)
 
-	exporter := NewExporter(envRepository, log.NewLogger(), export.NewExporter(commandFactory), nil)
+	exporter := NewExporter(envRepository, log.NewLogger(), export.NewExporter(commandFactory, fileManager), nil)
 
 	return exporter, testingMocks{
 		envRepository: envRepository,