Added AzureDevOpsUtil and minor refactoring in IosCodesigning classes

Quesar · Quesar · commit eb28609f3e18 · 2025-08-04T16:10:17.000+03:00
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=0.15.4.3-SNAPSHOT
+version=0.15.5.0-SNAPSHOT
diff --git a/src/main/java/lv/ctco/scm/gradle/MobilePluginTask.java b/src/main/java/lv/ctco/scm/gradle/MobilePluginTask.java
@@ -1,5 +1,6 @@
 package lv.ctco.scm.gradle;
 
+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;
 import lv.ctco.scm.gradle.utils.TeamcityUtil;
 
 import org.gradle.api.DefaultTask;
@@ -39,6 +40,9 @@ private void printError(String errorMessage) {
             getLogger().lifecycle(TeamcityUtil.generateBuildStatusServiceMessage("Execution failed for task "+this.getPath()));
             getLogger().lifecycle(TeamcityUtil.generateBuildProblemDescriptionServiceMessage(errorMessage));
         }
+        if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {
+            getLogger().lifecycle(AzureDevOpsUtil.generateErrorMessageServiceMessage(errorMessage));
+        }
     }
 
 }
diff --git a/src/main/java/lv/ctco/scm/gradle/android/ProjectInfoTask.java b/src/main/java/lv/ctco/scm/gradle/android/ProjectInfoTask.java
@@ -6,6 +6,7 @@
 
 package lv.ctco.scm.gradle.android;
 
+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;
 import lv.ctco.scm.gradle.utils.TeamcityUtil;
 
 import org.gradle.api.DefaultTask;
@@ -36,6 +37,9 @@ public void doTaskAction() {
             getLogger().lifecycle(TeamcityUtil.generateBuildNumberServiceMessage(buildVersion));
             getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.version.iteration", releaseVersion));
         }
+        if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {
+            getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));
+        }
     }
 
 }
diff --git a/src/main/java/lv/ctco/scm/gradle/utils/AzureDevOpsUtil.java b/src/main/java/lv/ctco/scm/gradle/utils/AzureDevOpsUtil.java
@@ -0,0 +1,23 @@
+package lv.ctco.scm.gradle.utils;
+
+public final class AzureDevOpsUtil {
+
+    private AzureDevOpsUtil() {}
+
+    public static boolean isAzureDevOpsEnvironment() {
+        return PropertyUtil.hasEnvironmentProperty("TF_BUILD");
+    }
+
+    public static String generateSetParameterServiceMessage(String parameterName, String parameterValue) {
+        return "##vso[task.setvariable variable="+parameterName+";isOutput=true]"+parameterValue;
+    }
+
+    public static String generateBuildNumberServiceMessage(String buildNumber) {
+        return "##vso[build.updatebuildnumber]"+buildNumber;
+    }
+
+    public static String generateErrorMessageServiceMessage(String errorMessageText) {
+        return "##vso[task.logissue type=error]"+errorMessageText;
+    }
+
+}
diff --git a/src/main/java/lv/ctco/scm/gradle/utils/ErrorUtil.java b/src/main/java/lv/ctco/scm/gradle/utils/ErrorUtil.java
@@ -22,6 +22,9 @@ private static void printError(String taskName, String errorMessage) {
             logger.lifecycle(TeamcityUtil.generateBuildStatusServiceMessage("Execution failed for task "+taskName));
             logger.lifecycle(TeamcityUtil.generateBuildProblemDescriptionServiceMessage(errorMessage));
         }
+        if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {
+            logger.lifecycle(AzureDevOpsUtil.generateErrorMessageServiceMessage(errorMessage));
+        }
     }
 
     public static void errorInTask(String taskName, String errorMessage) {
diff --git a/src/main/java/lv/ctco/scm/gradle/xamarin/ProjectInfoTask.java b/src/main/java/lv/ctco/scm/gradle/xamarin/ProjectInfoTask.java
@@ -6,6 +6,7 @@
 
 package lv.ctco.scm.gradle.xamarin;
 
+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;
 import lv.ctco.scm.gradle.utils.ErrorUtil;
 import lv.ctco.scm.mobile.utils.RevisionUtil;
 import lv.ctco.scm.gradle.utils.TeamcityUtil;
@@ -60,6 +61,9 @@ public void doTaskAction() {
             getLogger().lifecycle(TeamcityUtil.generateBuildNumberServiceMessage(buildVersion));
             getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.version.iteration", releaseVersion));
         }
+        if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {
+            getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));
+        }
     }
 
 }
diff --git a/src/main/java/lv/ctco/scm/gradle/xcode/ProjectInfoTask.java b/src/main/java/lv/ctco/scm/gradle/xcode/ProjectInfoTask.java
@@ -6,6 +6,7 @@
 
 package lv.ctco.scm.gradle.xcode;
 
+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;
 import lv.ctco.scm.gradle.utils.ErrorUtil;
 import lv.ctco.scm.mobile.utils.PlistUtil;
 import lv.ctco.scm.mobile.utils.RevisionUtil;
@@ -64,6 +65,9 @@ public void doTaskAction() {
             getLogger().lifecycle(TeamcityUtil.generateBuildNumberServiceMessage(buildVersion));
             getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.version.iteration", releaseVersion));
         }
+        if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {
+            getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));
+        }
     }
 
 }
diff --git a/src/main/java/lv/ctco/scm/gradle/xdeps/XdepsDisplayInfoTask.java b/src/main/java/lv/ctco/scm/gradle/xdeps/XdepsDisplayInfoTask.java
@@ -6,6 +6,7 @@
 
 package lv.ctco.scm.gradle.xdeps;
 
+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;
 import lv.ctco.scm.gradle.utils.TeamcityUtil;
 import lv.ctco.scm.mobile.utils.RevisionUtil;
 import lv.ctco.scm.mobile.utils.VersionUtil;
@@ -58,6 +59,9 @@ public void doTaskAction() {
             getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.xdeps.version.iteration", releaseVersion));
             getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.xdeps.version.publish", buildVersion));
         }
+        if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {
+            getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));
+        }
 
         List<DefaultMavenArtifactRepository> repositories = XdepsUtil.getMavenRepositories(getProject());
         getLogger().info("Detected {} defined Maven publication repositories", repositories.size());
diff --git a/src/main/java/lv/ctco/scm/mobile/utils/IosCodesigningIdentity.java b/src/main/java/lv/ctco/scm/mobile/utils/IosCodesigningIdentity.java
@@ -6,12 +6,36 @@
 
 package lv.ctco.scm.mobile.utils;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class IosCodesigningIdentity {
 
     private String commonName;
     private String identityName;
     private String identityType;
 
+    static final List<String> SUPPORTED_IDENTITY_TYPES = Arrays.asList(
+            "Apple Distribution", "Apple Developer", "iPhone Distribution", "iPhone Developer"
+    );
+
+    public IosCodesigningIdentity() {}
+
+    public IosCodesigningIdentity(String commonName) {
+        this.commonName = commonName.trim();
+        if (commonName.contains(":")) {
+            String identityType = (commonName.trim().split(":")[0]).trim();
+            if (SUPPORTED_IDENTITY_TYPES.contains(identityType)) {
+                this.identityType = identityType;
+                this.identityName = (commonName.split(":")[1]).trim();
+            } else {
+                throw new IllegalArgumentException("Unsupported commonName provided to IosCodesigningIdentity");
+            }
+        } else {
+            throw new IllegalArgumentException("Invalid commonName provided to IosCodesigningIdentity");
+        }
+    }
+
     public String getCommonName() {
         return commonName;
     }
diff --git a/src/main/java/lv/ctco/scm/mobile/utils/IosCodesigningUtil.java b/src/main/java/lv/ctco/scm/mobile/utils/IosCodesigningUtil.java
@@ -46,21 +46,16 @@ private IosCodesigningUtil() {}
     public static IosCodesigningIdentity getCodesigningIdentity(File appDir) {
         ExecCommand execCommand = new ExecCommand(EXECUTABLE_CODESIGN);
         execCommand.addArguments(new String[]{COMMAND_DISPLAY, OPTION_VERBOSE_4, appDir.getAbsolutePath()}, false);
-        IosCodesigningIdentity iosCodesigningIdentity = new IosCodesigningIdentity();
         logger.debug("Executing command:{}", execCommand);
         ExecResult execResult = ExecUtil.executeCommand(execCommand, new CapturingOutputStream());
         if (execResult.isSuccess()) {
             for (String line : execResult.getOutput()) {
                 if (line.trim().startsWith("Authority=")) {
-                    iosCodesigningIdentity.setCommonName(line.replaceFirst("Authority=", ""));
-                    if (iosCodesigningIdentity.getCommonName().startsWith("iPhone Distribution: ")) {
-                        iosCodesigningIdentity.setIdentityType("iPhone Distribution");
-                        iosCodesigningIdentity.setIdentityName(iosCodesigningIdentity.getCommonName().replace("iPhone Distribution: ", ""));
-                    } else if (iosCodesigningIdentity.getCommonName().startsWith("iPhone Developer: ")) {
-                        iosCodesigningIdentity.setIdentityType("iPhone Developer");
-                        iosCodesigningIdentity.setIdentityName(iosCodesigningIdentity.getCommonName().replace("iPhone Developer: ", ""));
+                    String identityType = line.trim().replaceFirst("Authority=", "").split(":")[0];
+                    logger.debug("Found identity type '{}' within signature authorities", identityType);
+                    if (IosCodesigningIdentity.SUPPORTED_IDENTITY_TYPES.contains(identityType)) {
+                        return new IosCodesigningIdentity(line.trim().replaceFirst("Authority=", ""));
                     }
-                    return iosCodesigningIdentity;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version=0.15.4.3-SNAPSHOT`
	`1`	`+version=0.15.5.0-SNAPSHOT`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package lv.ctco.scm.gradle;`
`2`	`2`
	`3`	`+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;`
`3`	`4`	`import lv.ctco.scm.gradle.utils.TeamcityUtil;`
`4`	`5`
`5`	`6`	`import org.gradle.api.DefaultTask;`
`@@ -39,6 +40,9 @@ private void printError(String errorMessage) {`
`39`	`40`	`getLogger().lifecycle(TeamcityUtil.generateBuildStatusServiceMessage("Execution failed for task "+this.getPath()));`
`40`	`41`	`getLogger().lifecycle(TeamcityUtil.generateBuildProblemDescriptionServiceMessage(errorMessage));`
`41`	`42`	`}`
	`43`	`+ if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {`
	`44`	`+ getLogger().lifecycle(AzureDevOpsUtil.generateErrorMessageServiceMessage(errorMessage));`
	`45`	`+ }`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`package lv.ctco.scm.gradle.android;`
`8`	`8`
	`9`	`+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;`
`9`	`10`	`import lv.ctco.scm.gradle.utils.TeamcityUtil;`
`10`	`11`
`11`	`12`	`import org.gradle.api.DefaultTask;`
`@@ -36,6 +37,9 @@ public void doTaskAction() {`
`36`	`37`	`getLogger().lifecycle(TeamcityUtil.generateBuildNumberServiceMessage(buildVersion));`
`37`	`38`	`getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.version.iteration", releaseVersion));`
`38`	`39`	`}`
	`40`	`+ if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {`
	`41`	`+ getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));`
	`42`	`+ }`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ private static void printError(String taskName, String errorMessage) {`
`22`	`22`	`logger.lifecycle(TeamcityUtil.generateBuildStatusServiceMessage("Execution failed for task "+taskName));`
`23`	`23`	`logger.lifecycle(TeamcityUtil.generateBuildProblemDescriptionServiceMessage(errorMessage));`
`24`	`24`	`}`
	`25`	`+ if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {`
	`26`	`+ logger.lifecycle(AzureDevOpsUtil.generateErrorMessageServiceMessage(errorMessage));`
	`27`	`+ }`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`public static void errorInTask(String taskName, String errorMessage) {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`package lv.ctco.scm.gradle.xamarin;`
`8`	`8`
	`9`	`+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;`
`9`	`10`	`import lv.ctco.scm.gradle.utils.ErrorUtil;`
`10`	`11`	`import lv.ctco.scm.mobile.utils.RevisionUtil;`
`11`	`12`	`import lv.ctco.scm.gradle.utils.TeamcityUtil;`
`@@ -60,6 +61,9 @@ public void doTaskAction() {`
`60`	`61`	`getLogger().lifecycle(TeamcityUtil.generateBuildNumberServiceMessage(buildVersion));`
`61`	`62`	`getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.version.iteration", releaseVersion));`
`62`	`63`	`}`
	`64`	`+ if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {`
	`65`	`+ getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));`
	`66`	`+ }`
`63`	`67`	`}`
`64`	`68`
`65`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`package lv.ctco.scm.gradle.xcode;`
`8`	`8`
	`9`	`+import lv.ctco.scm.gradle.utils.AzureDevOpsUtil;`
`9`	`10`	`import lv.ctco.scm.gradle.utils.ErrorUtil;`
`10`	`11`	`import lv.ctco.scm.mobile.utils.PlistUtil;`
`11`	`12`	`import lv.ctco.scm.mobile.utils.RevisionUtil;`
`@@ -64,6 +65,9 @@ public void doTaskAction() {`
`64`	`65`	`getLogger().lifecycle(TeamcityUtil.generateBuildNumberServiceMessage(buildVersion));`
`65`	`66`	`getLogger().lifecycle(TeamcityUtil.generateSetParameterServiceMessage("project.version.iteration", releaseVersion));`
`66`	`67`	`}`
	`68`	`+ if (AzureDevOpsUtil.isAzureDevOpsEnvironment()) {`
	`69`	`+ getLogger().lifecycle(AzureDevOpsUtil.generateBuildNumberServiceMessage(buildVersion));`
	`70`	`+ }`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`}`