From eb6ea0479ba776234c7a63e20c9798f0e791490a Mon Sep 17 00:00:00 2001
From: Laszlo Pusok <laszlo.pusok@bitrise.io>
Date: Wed, 5 Jan 2022 15:46:29 +0100
Subject: [PATCH] Use v2 stepconf in keychain package.

Solves API incompatibility, when parent package uses v2 stepconf.
./main.go:99:53: cannot use cfg.KeychainPassword (type "github.com/bitrise-io/go-steputils/v2/stepconf".Secret) as type "github.com/bitrise-io/go-steputils/stepconf".Secret in argument to keychain.New
---
 .../devportalclient/appstoreconnectclient/profiles_test.go   | 5 ++---
 autocodesign/keychain/keychain.go                            | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/autocodesign/devportalclient/appstoreconnectclient/profiles_test.go b/autocodesign/devportalclient/appstoreconnectclient/profiles_test.go
index 66ae5583..332a662e 100644
--- a/autocodesign/devportalclient/appstoreconnectclient/profiles_test.go
+++ b/autocodesign/devportalclient/appstoreconnectclient/profiles_test.go
@@ -8,11 +8,10 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_checkBundleIDEntitlements(t *testing.T) {
diff --git a/autocodesign/keychain/keychain.go b/autocodesign/keychain/keychain.go
index 4b8a66b0..a11543f4 100644
--- a/autocodesign/keychain/keychain.go
+++ b/autocodesign/keychain/keychain.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/bitrise-io/go-steputils/stepconf"
+	"github.com/bitrise-io/go-steputils/v2/stepconf"
 	"github.com/bitrise-io/go-utils/errorutil"
 	"github.com/bitrise-io/go-utils/fileutil"
 	"github.com/bitrise-io/go-utils/pathutil"