diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 711a3ed0d..48efb5548 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -2933,7 +2933,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Capture hash & comment from last WebRTC git commit.\ncd $PROJECT_DIR/ThirdParty/WebRTC/\n_git_commit=`git log --pretty=oneline | head -1`\ncd $PROJECT_DIR\n# Remove existing .plist entry, if any.\n/usr/libexec/PlistBuddy -c \"Delete WebRTCCommit\" Signal/Signal-Info.plist || true\n# Add new .plist entry.\n/usr/libexec/PlistBuddy -c \"add WebRTCCommit string '$_git_commit'\" Signal/Signal-Info.plist\n";
+ shellScript = "# Capture hash & comment from last WebRTC git commit.\ncd $PROJECT_DIR/ThirdParty/WebRTC/\n_git_commit=`git log --pretty=oneline | head -1`\ncd $PROJECT_DIR\n# Remove existing .plist entry, if any.\n/usr/libexec/PlistBuddy -c \"Delete WebRTCCommit\" Signal/Signal-Info.plist || true\n# Add new .plist entry.\n/usr/libexec/PlistBuddy -c \"add WebRTCCommit string '$_git_commit'\" Signal/Signal-Info.plist\n\n/usr/libexec/PlistBuddy -c \"Delete BuildXCodeVersion\" Signal/Signal-Info.plist || true\n/usr/libexec/PlistBuddy -c \"add BuildXCodeVersion string '${XCODE_VERSION_MAJOR}.${XCODE_VERSION_MINOR}'\" Signal/Signal-Info.plist\n\n_osx_version=`defaults read loginwindow SystemVersionStampAsString`\n/usr/libexec/PlistBuddy -c \"Delete BuildOSXVersion\" Signal/Signal-Info.plist || true\n/usr/libexec/PlistBuddy -c \"add BuildOSXVersion string '$_osx_version'\" Signal/Signal-Info.plist\n\n_cocoapods_version=`pod --version`\n/usr/libexec/PlistBuddy -c \"Delete BuildCocoapodsVersion\" Signal/Signal-Info.plist || true\n/usr/libexec/PlistBuddy -c \"add BuildCocoapodsVersion string '$_cocoapods_version'\" Signal/Signal-Info.plist\n\n_carthage_version=`carthage version`\n/usr/libexec/PlistBuddy -c \"Delete BuildCarthageVersion\" Signal/Signal-Info.plist || true\n/usr/libexec/PlistBuddy -c \"add BuildCarthageVersion string '$_carthage_version'\" Signal/Signal-Info.plist\n\n";
};
451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */ = {
isa = PBXShellScriptBuildPhase;
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 115b1d823..2c24f5f0a 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -2,6 +2,14 @@
+ BuildCarthageVersion
+ 0.31.0
+ BuildCocoapodsVersion
+ 1.5.3
+ BuildOSXVersion
+ 10.13.6
+ BuildXCodeVersion
+ 0900.0940
CFBundleDevelopmentRegion
en
CFBundleDisplayName
@@ -136,6 +144,8 @@
UIViewControllerBasedStatusBarAppearance
WebRTCCommit
- af8b6b232df749574744cd5d092227f8559969f9 M69
+ ca71024b4993ba95e3e6b8d0758004cffc54ddaf M70
+ XCodeVersion
+ 0900.0940
diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 8c475d095..afdb2237b 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -49,7 +49,7 @@
#import
#import
#import
-#import
+#import
@import WebRTC;
@import Intents;
@@ -468,15 +468,20 @@ static NSTimeInterval launchStartedAt;
OWSLogInfo(@"Language Code: %@", languageCode);
}
- size_t size;
- sysctlbyname("hw.machine", NULL, &size, NULL, 0);
- char *machine = malloc(size);
- sysctlbyname("hw.machine", machine, &size, NULL, 0);
- NSString *platform = [NSString stringWithUTF8String:machine];
- free(machine);
+ struct utsname systemInfo;
+ uname(&systemInfo);
+
+ OWSLogInfo(@"Device Model: %@ (%@)",
+ UIDevice.currentDevice.model,
+ [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding]);
- OWSLogInfo(@"iPhone Version: %@", platform);
OWSLogInfo(@"WebRTC Commit: %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"WebRTCCommit"]);
+ OWSLogInfo(@"Build XCode Version: %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"BuildXCodeVersion"]);
+ OWSLogInfo(@"Build OS X Version: %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"BuildOSXVersion"]);
+ OWSLogInfo(
+ @"Build Cocoapods Version: %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"BuildCocoapodsVersion"]);
+ OWSLogInfo(
+ @"Build Carthage Version: %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"BuildCarthageVersion"]);
}
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken