TS-40724 Added changelog and minor code improvement

cqse · Nov 12, 2024 · 426f9d8 · 426f9d8
1 parent 141393e
commit 426f9d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ We use [semantic versioning](http://semver.org/):
 - PATCH version when you make backwards compatible bug fixes.
 
 # Next Release
-- ...
+- [fix] Uploading `.xcresult` files was not possible when using Xcode version 16
 
 # 2.9.3
 - [fix] Using the `--insecure` flag now skips loading any custom certificates from OS trust stores

diff --git a/src/main/java/com/teamscale/upload/xcode/XcodeVersion.java b/src/main/java/com/teamscale/upload/xcode/XcodeVersion.java
@@ -36,15 +36,15 @@ public static XcodeVersion determine() {
 		}
 
 		String xcodeBuildVersionCommandOutput = result.output;
-		Matcher m = XCODE_BUILD_VERSION_PATTERN.matcher(xcodeBuildVersionCommandOutput);
-		if (!m.find()) {
+		Matcher xcodeVersionPatternMatcher = XCODE_BUILD_VERSION_PATTERN.matcher(xcodeBuildVersionCommandOutput);
+		if (!xcodeVersionPatternMatcher.find()) {
 			LogUtils.warn("Could not determine installed Xcode version. Assuming latest Xcode version is installed.");
 			LogUtils.debug("Output of 'xcodebuild -version' command:\n" + xcodeBuildVersionCommandOutput);
 			return latestVersion();
 		}
 
-		int major = Integer.parseInt(m.group("major"));
-		int minor = Integer.parseInt(m.group("minor"));
+		int major = Integer.parseInt(xcodeVersionPatternMatcher.group("major"));
+		int minor = Integer.parseInt(xcodeVersionPatternMatcher.group("minor"));
 		return new XcodeVersion(major, minor);
 	}