From 855a7665aef505db456aa1c6f1cb9ea2b68056da Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 13 Jul 2018 09:57:32 -0700 Subject: Restore iOS7 to GoogleUtilities (#1528) --- GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m') diff --git a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m index e96ba70..a1a63a2 100644 --- a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m +++ b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m @@ -19,6 +19,10 @@ #import #import +#if TARGET_OS_IOS +#import +#endif + /// The encryption info struct and constants are missing from the iPhoneSimulator SDK, but not from /// the iPhoneOS or Mac OS X SDKs. Since one doesn't ever ship a Simulator binary, we'll just /// provide the definitions here. @@ -212,6 +216,9 @@ static BOOL HasEmbeddedMobileProvision() { } + (NSString *)systemVersion { +#if TARGET_OS_IOS + return [UIDevice currentDevice].systemVersion; +#elif TARGET_OS_OSX || TARGET_OS_TV // Assemble the systemVersion, excluding the patch version if it's 0. NSOperatingSystemVersion osVersion = [NSProcessInfo processInfo].operatingSystemVersion; NSMutableString *versionString = [[NSMutableString alloc] @@ -219,8 +226,8 @@ static BOOL HasEmbeddedMobileProvision() { if (osVersion.patchVersion != 0) { [versionString appendFormat:@".%ld", (long)osVersion.patchVersion]; } - return versionString; +#endif } + (BOOL)isAppExtension { -- cgit v1.2.3