From ad321bb27910cec49f15b4ece124448d9fcf6b5c Mon Sep 17 00:00:00 2001
From: Ryan Wilson <wilsonryan@google.com>
Date: Mon, 16 Apr 2018 19:29:53 -0400
Subject: Match previous systemVersion functionality (#1120)

* Match previous systemVersion functionality

* style.sh

* Add new test file to test targets
---
 Firebase/Core/third_party/FIRAppEnvironmentUtil.m | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'Firebase/Core')

diff --git a/Firebase/Core/third_party/FIRAppEnvironmentUtil.m b/Firebase/Core/third_party/FIRAppEnvironmentUtil.m
index faee38b..8e76201 100644
--- a/Firebase/Core/third_party/FIRAppEnvironmentUtil.m
+++ b/Firebase/Core/third_party/FIRAppEnvironmentUtil.m
@@ -204,7 +204,18 @@ static BOOL isAppEncrypted() {
 }
 
 + (NSString *)systemVersion {
-  return [NSProcessInfo processInfo].operatingSystemVersionString;
+  // Assemble the systemVersion, excluding any insignificant digits.
+  NSOperatingSystemVersion osVersion = [NSProcessInfo processInfo].operatingSystemVersion;
+  NSMutableString *versionString = [[NSMutableString alloc] initWithFormat:@"%ld", (long)osVersion.majorVersion];
+  if (osVersion.minorVersion != 0) {
+    [versionString appendFormat:@".%ld", (long)osVersion.minorVersion];
+  }
+
+  if (osVersion.patchVersion != 0) {
+    [versionString appendFormat:@".%ld", (long)osVersion.patchVersion];
+  }
+
+  return versionString;
 }
 
 + (BOOL)isAppExtension {
-- 
cgit v1.2.3