From c7201c7d905090efd63ab79ff10d571a062684a3 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Thu, 3 Sep 2020 09:53:08 -0400 Subject: [PATCH] Update for Xcode 12 & build fixes. --- .../project.pbxproj | 2 -- .../project.pbxproj | 8 +++-- .../xcschemes/MasterPassword macOS.xcscheme | 13 ++------ .../xcshareddata/xcschemes/mpw-bench.xcscheme | 13 ++------ .../xcshareddata/xcschemes/mpw-cli.xcscheme | 19 +++-------- .../xcshareddata/xcschemes/mpw-test.xcscheme | 13 ++------ platform-darwin/Source/MPTypes.h | 2 ++ platform-darwin/Source/Mac/MPMacAppDelegate.m | 4 ++- .../project.pbxproj | 4 ++- platform-darwin/Source/iOS/MPAvatarCell.m | 32 +++++++++---------- .../Source/iOS/MPGuideViewController.m | 1 - .../Source/iOS/MPSitesViewController.m | 2 ++ .../Source/iOS/MPStoreViewController.m | 5 ++- .../Source/iOS/MPUsersViewController.m | 2 -- platform-darwin/Source/iOS/MPiOSAppDelegate.m | 2 ++ 15 files changed, 48 insertions(+), 74 deletions(-) diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 62e3157b..3490f7f5 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -332,7 +332,6 @@ DABD3C1E1711E2DC00CF925C /* MPPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BEB1711E2DC00CF925C /* MPPreferencesViewController.m */; }; DABD3C1F1711E2DC00CF925C /* MPTypeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BED1711E2DC00CF925C /* MPTypeViewController.m */; }; DABD3C211711E2DC00CF925C /* MPiOSConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BF11711E2DC00CF925C /* MPiOSConfig.m */; }; - DABD3C241711E2DC00CF925C /* MasterPassword.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BF81711E2DC00CF925C /* MasterPassword.entitlements */; }; DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BF91711E2DC00CF925C /* Settings.bundle */; }; DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BFA1711E2DC00CF925C /* InfoPlist.strings */; }; DABD3C271711E2DC00CF925C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BFC1711E2DC00CF925C /* main.m */; }; @@ -3446,7 +3445,6 @@ DA5E0E5E24589C9B0007FBA7 /* Icon-83@2x.png in Resources */, DA854C8418D4CFBF00106317 /* avatar-add.png in Resources */, DAA1764B19D8B82B0044227B /* login_name@2x.png in Resources */, - DABD3C241711E2DC00CF925C /* MasterPassword.entitlements in Resources */, DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */, DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */, DA32D05119D3D107004F3F0E /* icon_meter.png in Resources */, diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index c7b04f18..c5f27c5e 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -101,7 +101,6 @@ DA5E5D011724A667003798D8 /* MPKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CAE1724A667003798D8 /* MPKey.m */; }; DA5E5D031724A667003798D8 /* MPMacAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CB41724A667003798D8 /* MPMacAppDelegate.m */; }; DA5E5D041724A667003798D8 /* MPMacConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CB61724A667003798D8 /* MPMacConfig.m */; }; - DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CBF1724A667003798D8 /* MasterPassword.entitlements */; }; DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC21724A667003798D8 /* InfoPlist.strings */; }; DA5E5D0B1724A667003798D8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC41724A667003798D8 /* MainMenu.xib */; }; DA5E5D0C1724A667003798D8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CC61724A667003798D8 /* main.m */; }; @@ -2388,7 +2387,7 @@ CLASSPREFIX = MP; LastSwiftUpdateCheck = 0720; LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = Lyndir; TargetAttributes = { DA1C7AA61F1A8F24009A3551 = { @@ -2535,7 +2534,6 @@ DACA29671705DF81002C6C22 /* SourceCodePro-ExtraLight.otf in Resources */, DACA29681705DF81002C6C22 /* SourceCodePro-Black.otf in Resources */, DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */, - DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */, DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */, DA5E5D0B1724A667003798D8 /* MainMenu.xib in Resources */, DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */, @@ -3026,6 +3024,7 @@ CLANG_WARN_OBJC_RECEIVER_WEAK = NO; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -3127,6 +3126,7 @@ CLANG_WARN_OBJC_RECEIVER_WEAK = NO; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -3202,6 +3202,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; ENABLE_HARDENED_RUNTIME = YES; GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch"; @@ -3241,6 +3242,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; ENABLE_HARDENED_RUNTIME = YES; GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch"; diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS.xcscheme b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS.xcscheme index f224e6c2..102b82f7 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS.xcscheme +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS.xcscheme @@ -1,7 +1,7 @@ + LastUpgradeVersion = "1200" + version = "1.7"> @@ -27,15 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-bench.xcscheme b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-bench.xcscheme index 5d124f6e..5b0ea455 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-bench.xcscheme +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-bench.xcscheme @@ -1,7 +1,7 @@ + LastUpgradeVersion = "1200" + version = "1.7"> @@ -27,15 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-cli.xcscheme b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-cli.xcscheme index efc55177..c74f5d98 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-cli.xcscheme +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-cli.xcscheme @@ -1,6 +1,6 @@ - - - - @@ -81,10 +72,6 @@ isEnabled = "YES"> - - + + + LastUpgradeVersion = "1200" + version = "1.7"> @@ -27,15 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - diff --git a/platform-darwin/Source/MPTypes.h b/platform-darwin/Source/MPTypes.h index cccdaceb..47c52478 100644 --- a/platform-darwin/Source/MPTypes.h +++ b/platform-darwin/Source/MPTypes.h @@ -16,7 +16,9 @@ // LICENSE file. Alternatively, see . //============================================================================== +MP_LIBS_BEGIN #import +MP_LIBS_END __BEGIN_DECLS extern NSString *const MPErrorDomain; diff --git a/platform-darwin/Source/Mac/MPMacAppDelegate.m b/platform-darwin/Source/Mac/MPMacAppDelegate.m index e3476140..ff17f5ea 100644 --- a/platform-darwin/Source/Mac/MPMacAppDelegate.m +++ b/platform-darwin/Source/Mac/MPMacAppDelegate.m @@ -22,10 +22,12 @@ #import "MPSecrets.h" #import "mpw-marshal.h" +MP_LIBS_BEGIN #import #import #import #import +MP_LIBS_END #define LOGIN_HELPER_BUNDLE_ID @"com.lyndir.lhunath.MasterPassword.Mac.LoginHelper" @@ -71,7 +73,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven [SentrySDK startWithOptions:@{ @"dsn" : NilToNSNull( decrypt( sentryDSN ) ), #ifdef DEBUG - @"debug" : @(YES), + @"debug" : @(NO), @"environment" : @"Development", #elif PUBLIC @"debug" : @(NO), diff --git a/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj b/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj index fd298b34..2cf0c116 100644 --- a/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj +++ b/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj @@ -102,7 +102,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; CLASSPREFIX = MP; - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Maarten Billemont"; TargetAttributes = { DAD9B5C0176299B9001835F9 = { @@ -185,6 +185,7 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -271,6 +272,7 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; diff --git a/platform-darwin/Source/iOS/MPAvatarCell.m b/platform-darwin/Source/iOS/MPAvatarCell.m index 239ae848..d2900757 100644 --- a/platform-darwin/Source/iOS/MPAvatarCell.m +++ b/platform-darwin/Source/iOS/MPAvatarCell.m @@ -58,22 +58,6 @@ const long MPAvatarAdd = 10000; self.avatarImageView.layer.masksToBounds = NO; self.avatarImageView.backgroundColor = [UIColor clearColor]; - [self observeKeyPath:@"bounds" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) { - self.contentView.frame = self.bounds; - }]; - [self observeKeyPath:@"selected" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) { - [self updateAnimated:self.superview != nil]; - }]; - [self observeKeyPath:@"highlighted" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) { - [self updateAnimated:self.superview != nil]; - }]; - PearlAddNotificationObserver( UIKeyboardWillShowNotification, nil, [NSOperationQueue mainQueue], - ^(MPAvatarCell *self, NSNotification *note) { - CGRect keyboardRect = [note.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGFloat keyboardHeight = CGRectGetHeight( self.window.screen.bounds ) - CGRectGetMinY( keyboardRect ); - [self.keyboardHeightConstraint updateConstant:keyboardHeight]; - } ); - CABasicAnimation *toShadowOpacityAnimation = [CABasicAnimation animationWithKeyPath:@"shadowOpacity"]; toShadowOpacityAnimation.toValue = @0.2f; toShadowOpacityAnimation.duration = 0.5f; @@ -91,6 +75,22 @@ const long MPAvatarAdd = 10000; self.targetedShadowAnimation.duration = MAXFLOAT; self.avatarImageView.layer.shadowColor = [UIColor whiteColor].CGColor; self.avatarImageView.layer.shadowOffset = CGSizeZero; + + [self observeKeyPath:@"bounds" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) { + self.contentView.frame = self.bounds; + }]; + [self observeKeyPath:@"selected" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) { + [self updateAnimated:self.superview != nil]; + }]; + [self observeKeyPath:@"highlighted" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) { + [self updateAnimated:self.superview != nil]; + }]; + PearlAddNotificationObserver( UIKeyboardWillShowNotification, nil, [NSOperationQueue mainQueue], + ^(MPAvatarCell *self, NSNotification *note) { + CGRect keyboardRect = [note.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue]; + CGFloat keyboardHeight = CGRectGetHeight( self.window.screen.bounds ) - CGRectGetMinY( keyboardRect ); + [self.keyboardHeightConstraint updateConstant:keyboardHeight]; + } ); } - (void)prepareForReuse { diff --git a/platform-darwin/Source/iOS/MPGuideViewController.m b/platform-darwin/Source/iOS/MPGuideViewController.m index 1e8eb10d..e888000b 100644 --- a/platform-darwin/Source/iOS/MPGuideViewController.m +++ b/platform-darwin/Source/iOS/MPGuideViewController.m @@ -17,7 +17,6 @@ //============================================================================== #import "MPGuideViewController.h" -#import "markdown_lib.h" #import "NSString+MPMarkDown.h" @interface MPGuideStep : NSObject diff --git a/platform-darwin/Source/iOS/MPSitesViewController.m b/platform-darwin/Source/iOS/MPSitesViewController.m index 41b269d3..776502ef 100644 --- a/platform-darwin/Source/iOS/MPSitesViewController.m +++ b/platform-darwin/Source/iOS/MPSitesViewController.m @@ -16,7 +16,9 @@ // LICENSE file. Alternatively, see . //============================================================================== +MP_LIBS_BEGIN #import +MP_LIBS_END #import "MPSitesViewController.h" #import "MPiOSAppDelegate.h" diff --git a/platform-darwin/Source/iOS/MPStoreViewController.m b/platform-darwin/Source/iOS/MPStoreViewController.m index 6909cf30..c9f57fa3 100644 --- a/platform-darwin/Source/iOS/MPStoreViewController.m +++ b/platform-darwin/Source/iOS/MPStoreViewController.m @@ -18,10 +18,13 @@ #import "MPStoreViewController.h" #import "MPiOSAppDelegate.h" -#import "UIColor+Expanded.h" #import "MPAppDelegate_InApp.h" #import "MPSitesViewController.h" +MP_LIBS_BEGIN +#import "UIColor+Expanded.h" +MP_LIBS_END + PearlEnum( MPDevelopmentFuelConsumption, MPDevelopmentFuelConsumptionQuarterly, MPDevelopmentFuelConsumptionMonthly, MPDevelopmentFuelWeekly ); diff --git a/platform-darwin/Source/iOS/MPUsersViewController.m b/platform-darwin/Source/iOS/MPUsersViewController.m index 108b2d33..4456867b 100644 --- a/platform-darwin/Source/iOS/MPUsersViewController.m +++ b/platform-darwin/Source/iOS/MPUsersViewController.m @@ -57,7 +57,6 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) { @property(nonatomic) NSUInteger marqueeTipTextIndex; @property(nonatomic, copy) NSString *masterPasswordChoice; @property(nonatomic, strong) NSOperationQueue *afterUpdates; -@property(nonatomic, weak) id contextChangedObserver; @property(nonatomic, strong) NSFetchedResultsController *userResultsController; @end @@ -644,7 +643,6 @@ referenceSizeForFooterInSection:(NSInteger)section { [self removeKeyPathObservers]; PearlRemoveNotificationObservers(); - [[NSNotificationCenter defaultCenter] removeObserver:self.contextChangedObserver]; } - (void)registerObservers { diff --git a/platform-darwin/Source/iOS/MPiOSAppDelegate.m b/platform-darwin/Source/iOS/MPiOSAppDelegate.m index d8b0cef5..d9348ae2 100644 --- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m +++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m @@ -23,8 +23,10 @@ #import "mpw-marshal.h" #import "MPSecrets.h" +MP_LIBS_BEGIN #import #import +MP_LIBS_END @interface CountlyPushNotifications @end