Migrate packages

_integration_tests/zip/ipa_reader_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 
 	"github.com/bitrise-io/go-utils/v2/log"
-	"github.com/bitrise-io/go-xcode/plistutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/_integration_tests"
 	"github.com/bitrise-io/go-xcode/v2/artifacts"
 	internalzip "github.com/bitrise-io/go-xcode/v2/internal/zip"
+	"github.com/bitrise-io/go-xcode/v2/plistutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/zip"
 	"github.com/stretchr/testify/require"
 )

artifacts/ios_xcarchive_reader.go

@@ -1,7 +1,7 @@
 package artifacts
 
 import (
-	"github.com/bitrise-io/go-xcode/plistutil"
+	"github.com/bitrise-io/go-xcode/v2/plistutil"
 )
 
 // IOSXCArchiveReader ...

artifacts/ipa_reader.go

@@ -3,8 +3,8 @@ package artifacts
 import (
 	"fmt"
 
-	"github.com/bitrise-io/go-xcode/plistutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
+	"github.com/bitrise-io/go-xcode/v2/plistutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 // IPAReader ...

artifacts/xcarchive_reader.go

@@ -1,7 +1,7 @@
 package artifacts
 
 import (
-	"github.com/bitrise-io/go-xcode/plistutil"
+	"github.com/bitrise-io/go-xcode/v2/plistutil"
 )
 
 // XCArchiveReader ...

autocodesign/autocodesign.go

@@ -10,10 +10,10 @@ import (
 	"math/big"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/devportalservice"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/bitrise-io/go-xcode/xcodeproject/serialized"
 )
 

autocodesign/autocodesign_test.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	devportaltime "github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

autocodesign/certdownloader/certdownloader.go

@@ -10,8 +10,8 @@ import (
 	"github.com/bitrise-io/go-steputils/input"
 	"github.com/bitrise-io/go-utils/filedownloader"
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 // CertificateAndPassphrase contains a p12 file URL and passphrase

autocodesign/certdownloader/certdownloader_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/assert"
 )
 

autocodesign/certificates.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 func selectCertificatesAndDistributionTypes(certificateSource DevPortalClient, typeToLocalCerts LocalCertificates, distribution DistributionType, signUITestTargets bool, verboseLog bool) (map[appstoreconnect.CertificateType][]Certificate, []DistributionType, error) {

autocodesign/certificates_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )

autocodesign/codesignasset/writer.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/bitrise-io/go-utils/log"
 	"github.com/bitrise-io/go-utils/pathutil"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/keychain"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 const (

autocodesign/devportalclient/appstoreconnectclient/certificates.go

@@ -7,9 +7,9 @@ import (
 	"math/big"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 // CertificateSource ...

autocodesign/devportalclient/spaceship/certificates.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 // CertificateSource ...

autocodesign/keychain/keychain.go

@@ -11,7 +11,7 @@ import (
 	"github.com/bitrise-io/go-utils/fileutil"
 	"github.com/bitrise-io/go-utils/pathutil"
 	"github.com/bitrise-io/go-utils/v2/command"
-	"github.com/bitrise-io/go-xcode/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/hashicorp/go-version"
 )
 

autocodesign/keychain/keychain_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/bitrise-io/go-steputils/v2/stepconf"
 	"github.com/bitrise-io/go-utils/v2/command"
 	"github.com/bitrise-io/go-utils/v2/env"
-	"github.com/bitrise-io/go-xcode/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 func TestCreateKeychain(t *testing.T) {

autocodesign/localcodesignasset/localcodesignasset_test.go

@@ -6,12 +6,12 @@ import (
 
 	devportaltime "github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
-	"github.com/bitrise-io/go-xcode/exportoptions"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/localcodesignasset/mocks"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/exportoptions"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

autocodesign/localcodesignasset/profile.go

@@ -1,10 +1,10 @@
 package localcodesignasset
 
 import (
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 // Profile ...

autocodesign/localcodesignasset/profileconverter.go

@@ -3,8 +3,8 @@ package localcodesignasset
 import (
 	"os"
 
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 // ProvisioningProfileConverter ...

autocodesign/localcodesignasset/profilelookup.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/bitrise-io/go-utils/sliceutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 func findProfile(localProfiles []profileutil.ProvisioningProfileInfoModel, platform autocodesign.Platform, distributionType autocodesign.DistributionType, bundleID string, entitlements autocodesign.Entitlements, minProfileDaysValid int, certSerials []string, deviceUDIDs []string) *profileutil.ProvisioningProfileInfoModel {

autocodesign/localcodesignasset/profilelookup_test.go

@@ -3,10 +3,10 @@ package localcodesignasset
 import (
 	"testing"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
-	"github.com/bitrise-io/go-xcode/exportoptions"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/exportoptions"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/stretchr/testify/assert"
 )
 

autocodesign/localcodesignasset/profileprovider.go

@@ -1,6 +1,6 @@
 package localcodesignasset
 
-import "github.com/bitrise-io/go-xcode/profileutil"
+import "github.com/bitrise-io/go-xcode/v2/profileutil"
 
 // ProvisioningProfileProvider can list profile infos.
 type ProvisioningProfileProvider interface {

autocodesign/profiledownloader/profiledownloader.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/bitrise-io/go-steputils/input"
 	"github.com/bitrise-io/go-utils/filedownloader"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/localcodesignasset"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 type downloader struct {

autocodesign/profiles.go

@@ -10,8 +10,8 @@ import (
 	"github.com/bitrise-io/go-utils/log"
 	"github.com/bitrise-io/go-utils/retry"
 	"github.com/bitrise-io/go-utils/sliceutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/bitrise-io/go-xcode/xcodeproject/serialized"
 )
 

autocodesign/projectmanager/projecthelper.go

@@ -8,6 +8,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/bitrise-io/go-plist"
 	"github.com/bitrise-io/go-utils/fileutil"
 	"github.com/bitrise-io/go-utils/log"
 	"github.com/bitrise-io/go-utils/pathutil"
@@ -17,7 +18,6 @@ import (
 	"github.com/bitrise-io/go-xcode/xcodeproject/serialized"
 	"github.com/bitrise-io/go-xcode/xcodeproject/xcodeproj"
 	"github.com/bitrise-io/go-xcode/xcodeproject/xcscheme"
-	"howett.net/plist"
 )
 
 // ProjectHelper ...

autocodesign/utils_test.go

@@ -3,9 +3,9 @@ package autocodesign
 import (
 	"testing"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/assert"
 )
 

certificateutil/filter.go

@@ -0,0 +1,58 @@
+package certificateutil
+
+import "sort"
+
+// FilterCertificateInfoModelsByFilterFunc ...
+func FilterCertificateInfoModelsByFilterFunc(certificates []CertificateInfoModel, filterFunc func(certificate CertificateInfoModel) bool) []CertificateInfoModel {
+	filteredCertificates := []CertificateInfoModel{}
+
+	for _, certificate := range certificates {
+		if filterFunc(certificate) {
+			filteredCertificates = append(filteredCertificates, certificate)
+		}
+	}
+
+	return filteredCertificates
+}
+
+// ValidCertificateInfo contains the certificate infos filtered as valid, invalid and duplicated common name certificates
+type ValidCertificateInfo struct {
+	ValidCertificates,
+	InvalidCertificates,
+	DuplicatedCertificates []CertificateInfoModel
+}
+
+// FilterValidCertificateInfos filters out invalid and duplicated common name certificaates
+func FilterValidCertificateInfos(certificateInfos []CertificateInfoModel) ValidCertificateInfo {
+	var invalidCertificates []CertificateInfoModel
+	nameToCerts := map[string][]CertificateInfoModel{}
+	for _, certificateInfo := range certificateInfos {
+		if certificateInfo.CheckValidity() != nil {
+			invalidCertificates = append(invalidCertificates, certificateInfo)
+			continue
+		}
+
+		nameToCerts[certificateInfo.CommonName] = append(nameToCerts[certificateInfo.CommonName], certificateInfo)
+	}
+
+	var validCertificates, duplicatedCertificates []CertificateInfoModel
+	for _, certs := range nameToCerts {
+		if len(certs) == 0 {
+			continue
+		}
+
+		sort.Slice(certs, func(i, j int) bool {
+			return certs[i].EndDate.After(certs[j].EndDate)
+		})
+		validCertificates = append(validCertificates, certs[0])
+		if len(certs) > 1 {
+			duplicatedCertificates = append(duplicatedCertificates, certs[1:]...)
+		}
+	}
+
+	return ValidCertificateInfo{
+		ValidCertificates:      validCertificates,
+		InvalidCertificates:    invalidCertificates,
+		DuplicatedCertificates: duplicatedCertificates,
+	}
+}