Add new export methods (#265)

* Add new export methods

Author: lpusok

export/mac.go

@@ -44,7 +44,7 @@ func CreateMacCodeSignGroup(selectableGroups []SelectableCodeSignGroup, installe
 	iosCodesignGroups := CreateIosCodeSignGroups(selectableGroups)
 
 	for _, group := range iosCodesignGroups {
-		if exportMethod == exportoptions.MethodAppStore {
+		if exportMethod.IsAppStore() {
 			installerCertificates := []certificateutil.CertificateInfoModel{}
 
 			for _, installerCertificate := range installedInstallerCertificates {

exportoptions/appstore_options.go

@@ -8,6 +8,7 @@ import (
 
 // AppStoreOptionsModel ...
 type AppStoreOptionsModel struct {
+	Method                             Method
 	TeamID                             string
 	BundleIDProvisioningProfileMapping map[string]string
 	SigningCertificate                 string
@@ -26,9 +27,19 @@ type AppStoreOptionsModel struct {
 	TestFlightInternalTestingOnly bool
 }
 
-// NewAppStoreOptions ...
+// NewAppStoreOptions sets "app-store" as the export method
+// deprecated: use NewAppStoreConnectOptions instead
 func NewAppStoreOptions() AppStoreOptionsModel {
+	return NewAppStoreConnectOptions(MethodAppStore)
+}
+
+// NewAppStoreConnectOptions sets either "app-store" or "app-store-connect" as the export method
+func NewAppStoreConnectOptions(method Method) AppStoreOptionsModel {
+	if !method.IsAppStore() {
+		panic("non app-store method passed to NewAppStoreConnectOptions")
+	}
 	return AppStoreOptionsModel{
+		Method:                        method,
 		UploadBitcode:                 UploadBitcodeDefault,
 		UploadSymbols:                 UploadSymbolsDefault,
 		ManageAppVersion:              manageAppVersionDefault,
@@ -39,7 +50,7 @@ func NewAppStoreOptions() AppStoreOptionsModel {
 // Hash ...
 func (options AppStoreOptionsModel) Hash() map[string]interface{} {
 	hash := map[string]interface{}{}
-	hash[MethodKey] = MethodAppStore
+	hash[MethodKey] = options.Method
 	if options.TeamID != "" {
 		hash[TeamIDKey] = options.TeamID
 	}

exportoptions/exportoptions_test.go

@@ -105,18 +105,18 @@ func TestManifestToHash(t *testing.T) {
 	}
 }
 
-func TestNewAppStoreOptions(t *testing.T) {
+func TestNewAppStoreConnectOptions(t *testing.T) {
 	t.Log("create app-store type export options with default values")
 	{
-		options := NewAppStoreOptions()
+		options := NewAppStoreConnectOptions(MethodAppStoreConnect)
 		require.Equal(t, UploadBitcodeDefault, options.UploadBitcode)
 		require.Equal(t, UploadSymbolsDefault, options.UploadSymbols)
 		require.Equal(t, TestFlightInternalTestingOnlyDefault, options.TestFlightInternalTestingOnly)
 	}
 }
 
 func TestAppStoreOptionsToHash(t *testing.T) {
-	t.Log("default app-store type options creates hash with method")
+	t.Log("default app-store type options creates hash with legacy method")
 	{
 		options := NewAppStoreOptions()
 		options.ManageAppVersion = true
@@ -130,6 +130,20 @@ func TestAppStoreOptionsToHash(t *testing.T) {
 		}
 	}
 
+	t.Log("default app-store type options creates hash with new method")
+	{
+		options := NewAppStoreConnectOptions(MethodAppStoreConnect)
+		options.ManageAppVersion = true
+		hash := options.Hash()
+		require.Equal(t, 1, len(hash), fmt.Sprintf("Hash: %+v", hash))
+
+		{
+			value, ok := hash[MethodKey]
+			require.Equal(t, true, ok)
+			require.Equal(t, MethodAppStoreConnect, value)
+		}
+	}
+
 	t.Log("custom app-store type option's generated hash contains all properties")
 	{
 		options := NewAppStoreOptions()
@@ -182,7 +196,7 @@ func TestAppStoreOptionsWriteToFile(t *testing.T) {
 		require.NoError(t, err)
 		pth := filepath.Join(tmpDir, "exportOptions.plist")
 
-		options := NewAppStoreOptions()
+		options := NewAppStoreConnectOptions(MethodAppStoreConnect)
 		options.ManageAppVersion = true
 		require.NoError(t, options.WriteToFile(pth))
 
@@ -193,7 +207,7 @@ func TestAppStoreOptionsWriteToFile(t *testing.T) {
 <plist version="1.0">
 	<dict>
 		<key>method</key>
-		<string>app-store</string>
+		<string>app-store-connect</string>
 	</dict>
 </plist>`
 		require.Equal(t, desired, content)

exportoptions/properties.go

@@ -83,23 +83,45 @@ const MethodKey = "method"
 type Method string
 
 const (
-	// MethodAppStore ...
+	// MethodAppStore is deprecated since Xcode 15.3, its new name is MethodAppStoreConnect
 	MethodAppStore Method = "app-store"
-	// MethodAdHoc ...
+	// MethodAdHoc is deprecated since Xcode 15.3, its new name is MethodReleaseTesting
 	MethodAdHoc Method = "ad-hoc"
 	// MethodPackage ...
 	MethodPackage Method = "package"
 	// MethodEnterprise ...
 	MethodEnterprise Method = "enterprise"
-	// MethodDevelopment ...
+	// MethodDevelopment is deprecated since Xcode 15.3, its new name is MethodDebugging
 	MethodDevelopment Method = "development"
 	// MethodDeveloperID ...
 	MethodDeveloperID Method = "developer-id"
+	// MethodDebugging is the new name for MethodDevelopment since Xcode 15.3
+	MethodDebugging Method = "debugging"
+	// MethodAppStoreConnect is the new name for MethodAppStore since Xcode 15.3
+	MethodAppStoreConnect Method = "app-store-connect"
+	// MethodReleaseTesting is the new name for MethodAdHoc since Xcode 15.3
+	MethodReleaseTesting Method = "release-testing"
 	// MethodDefault ...
 	MethodDefault Method = MethodDevelopment
 )
 
-// ParseMethod ...
+func (m Method) IsAppStore() bool {
+	return m == MethodAppStore || m == MethodAppStoreConnect
+}
+
+func (m Method) IsAdHoc() bool {
+	return m == MethodAdHoc || m == MethodReleaseTesting
+}
+
+func (m Method) IsDevelopment() bool {
+	return m == MethodDevelopment || m == MethodDebugging
+}
+
+func (m Method) IsEnterprise() bool {
+	return m == MethodEnterprise
+}
+
+// ParseMethod parses Step input and returns the corresponding Method.
 func ParseMethod(method string) (Method, error) {
 	switch method {
 	case "app-store":
@@ -119,6 +141,20 @@ func ParseMethod(method string) (Method, error) {
 	}
 }
 
+// UpgradeToXcode15_3MethodName replaces the legacy export method strings with the ones available in Xcode 15.3 and later.
+func UpgradeToXcode15_3MethodName(method Method) Method {
+	switch method {
+	case MethodAppStore:
+		return MethodAppStoreConnect
+	case MethodAdHoc:
+		return MethodReleaseTesting
+	case MethodDevelopment:
+		return MethodDebugging
+	default:
+		return method
+	}
+}
+
 // OnDemandResourcesAssetPacksBaseURLKey ....
 const OnDemandResourcesAssetPacksBaseURLKey = "onDemandResourcesAssetPacksBaseURL"
 

exportoptions/properties_test.go

@@ -0,0 +1,45 @@
+package exportoptions
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestUpgradeToXcode15_3MethodName(t *testing.T) {
+	tests := []struct {
+		name   string
+		method Method
+		want   Method
+	}{
+		{
+			method: "app-store",
+			want:   "app-store-connect",
+		},
+		{
+			method: "ad-hoc",
+			want:   "release-testing",
+		},
+		{
+			method: "development",
+			want:   "debugging",
+		},
+		{
+			method: "enterprise",
+			want:   "enterprise",
+		},
+		{
+			method: "developer-id",
+			want:   "developer-id",
+		},
+		{
+			method: "package",
+			want:   "package",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.want, UpgradeToXcode15_3MethodName(tt.method))
+		})
+	}
+}