Fix build warnings from XCode 9.

This commit is contained in:
Matthew Chen 2017-11-08 12:56:55 -05:00
parent 48df161eb5
commit 2d21e2ae2c
12 changed files with 31 additions and 18 deletions

View file

@ -1844,7 +1844,7 @@
attributes = { attributes = {
LastSwiftUpdateCheck = 0720; LastSwiftUpdateCheck = 0720;
LastTestingUpgradeCheck = 0600; LastTestingUpgradeCheck = 0600;
LastUpgradeCheck = 0830; LastUpgradeCheck = 0910;
ORGANIZATIONNAME = "Open Whisper Systems"; ORGANIZATIONNAME = "Open Whisper Systems";
TargetAttributes = { TargetAttributes = {
D221A088169C9E5E00537ABF = { D221A088169C9E5E00537ABF = {
@ -2542,6 +2542,8 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
@ -2550,6 +2552,8 @@
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_RECEIVER_WEAK = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
@ -2731,6 +2735,8 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
@ -2739,6 +2745,8 @@
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_RECEIVER_WEAK = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
@ -2796,6 +2804,8 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
@ -2804,6 +2814,8 @@
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_RECEIVER_WEAK = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0830" LastUpgradeVersion = "0910"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -40,6 +40,7 @@
buildConfiguration = "Test" buildConfiguration = "Test"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "NO"> shouldUseLaunchSchemeArgsEnv = "NO">
<Testables> <Testables>
<TestableReference <TestableReference
@ -76,6 +77,7 @@
buildConfiguration = "Debug" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0" launchStyle = "0"
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"

View file

@ -107,6 +107,12 @@
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "167.png", "filename" : "167.png",
"scale" : "2x" "scale" : "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "iTunesArtwork@3x.png",
"scale" : "1x"
} }
], ],
"info" : { "info" : {

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -300,11 +300,6 @@ NS_ASSUME_NONNULL_BEGIN
return result; return result;
} }
- (void)prepareForReuse
{
[super prepareForReuse];
}
#pragma mark - UIMenuController #pragma mark - UIMenuController
- (void)showMenuController - (void)showMenuController

View file

@ -2551,7 +2551,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
- (void)imagePickerController:(UIImagePickerController *)picker - (void)imagePickerController:(UIImagePickerController *)picker
didFinishPickingMediaWithInfo:(NSDictionary<NSString *, id> *)info didFinishPickingMediaWithInfo:(NSDictionary<NSString *, id> *)info
filename:(NSString *)filename filename:(NSString *_Nullable)filename
{ {
OWSAssert([NSThread isMainThread]); OWSAssert([NSThread isMainThread]);

View file

@ -279,8 +279,9 @@ const NSUInteger kAvatarViewDiameter = 52;
- (void)prepareForReuse - (void)prepareForReuse
{ {
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super prepareForReuse]; [super prepareForReuse];
[[NSNotificationCenter defaultCenter] removeObserver:self];
} }
#pragma mark - Name #pragma mark - Name

View file

@ -249,6 +249,8 @@ const CGFloat kContactTableViewCellAvatarTextMargin = 12;
- (void)prepareForReuse - (void)prepareForReuse
{ {
[super prepareForReuse];
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
self.accessoryMessage = nil; self.accessoryMessage = nil;

View file

@ -27,8 +27,6 @@ typedef NS_ENUM(NSInteger, OWSInteractionType) {
@property (nonatomic, readonly) TSThread *thread; @property (nonatomic, readonly) TSThread *thread;
@property (nonatomic, readonly) uint64_t timestamp; @property (nonatomic, readonly) uint64_t timestamp;
- (BOOL)isDynamicInteraction;
- (OWSInteractionType)interactionType; - (OWSInteractionType)interactionType;
- (TSThread *)threadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction; - (TSThread *)threadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;

View file

@ -547,9 +547,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
OWSAssert(dataSource); OWSAssert(dataSource);
dispatch_async([OWSDispatch attachmentsQueue], ^{ dispatch_async([OWSDispatch attachmentsQueue], ^{
TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:contentType TSAttachmentStream *attachmentStream =
byteCount:dataSource.dataLength [[TSAttachmentStream alloc] initWithContentType:contentType
sourceFilename:sourceFilename]; byteCount:(UInt32)dataSource.dataLength
sourceFilename:sourceFilename];
if (message.isVoiceMessage) { if (message.isVoiceMessage) {
attachmentStream.attachmentType = TSAttachmentTypeVoiceMessage; attachmentStream.attachmentType = TSAttachmentTypeVoiceMessage;
} }

View file

@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable instancetype)init; - (nullable instancetype)init;
- (instancetype)init NS_UNAVAILABLE;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

View file

@ -24,8 +24,6 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds; + (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds;
+ (uint64_t)ows_millisecondsSince1970ForDate:(NSDate *)date; + (uint64_t)ows_millisecondsSince1970ForDate:(NSDate *)date;
+ (NSString *)formatPastTimestampRelativeToNow:(uint64_t)timestamp;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END