From 58a6f1764190a09438466696f0cea5b7ad13ba64 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 11 Mar 2017 11:20:15 -0500 Subject: [PATCH] Updates for latest Xcode. --- platform-darwin/External/Pearl | 2 +- platform-darwin/External/iOS/Reveal.framework | 1 - .../project.pbxproj | 19 ++++--------------- ...=> MasterPassword iOS: App Store.xcscheme} | 0 ... MasterPassword iOS: Development.xcscheme} | 0 .../project.pbxproj | 4 ++-- .../contents.xcworkspacedata | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../MasterPassword macOS: App Store.xcscheme} | 8 ++++---- ...asterPassword macOS: Development.xcscheme} | 8 ++++---- .../xcshareddata/xcschemes/mpw-test.xcscheme | 8 ++++---- .../contents.xcworkspacedata | 2 +- .../Source/iOS/MPPasswordsViewController.m | 5 ++--- .../Source/iOS/MPUsersViewController.m | 5 ++--- 14 files changed, 24 insertions(+), 38 deletions(-) delete mode 120000 platform-darwin/External/iOS/Reveal.framework rename platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/{MasterPassword iOS (App Store).xcscheme => MasterPassword iOS: App Store.xcscheme} (100%) rename platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/{MasterPassword iOS (Development).xcscheme => MasterPassword iOS: Development.xcscheme} (100%) rename platform-darwin/{MasterPassword-Mac.xcodeproj => MasterPassword-macOS.xcodeproj}/project.pbxproj (99%) rename platform-darwin/{MasterPassword-Mac.xcodeproj => MasterPassword-macOS.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename platform-darwin/{MasterPassword-Mac.xcodeproj => MasterPassword-macOS.xcodeproj}/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename platform-darwin/{MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme => MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: App Store.xcscheme} (90%) rename platform-darwin/{MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme => MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: Development.xcscheme} (91%) rename platform-darwin/{MasterPassword-Mac.xcodeproj => MasterPassword-macOS.xcodeproj}/xcshareddata/xcschemes/mpw-test.xcscheme (90%) diff --git a/platform-darwin/External/Pearl b/platform-darwin/External/Pearl index 4ac4add4..789d5c80 160000 --- a/platform-darwin/External/Pearl +++ b/platform-darwin/External/Pearl @@ -1 +1 @@ -Subproject commit 4ac4add457ea8ac7122ac0c2b628651c1de6f2ef +Subproject commit 789d5c80dc2d3432ab73b61f9d380d190e0189a1 diff --git a/platform-darwin/External/iOS/Reveal.framework b/platform-darwin/External/iOS/Reveal.framework deleted file mode 120000 index 97e7aea1..00000000 --- a/platform-darwin/External/iOS/Reveal.framework +++ /dev/null @@ -1 +0,0 @@ -/Applications/Reveal.app/Contents/SharedSupport/iOS-Libraries/Reveal.framework \ No newline at end of file diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 56a0e7cb..b8d6d0a1 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -419,8 +419,6 @@ DAFE4A5315039824003ABA7C /* PearlUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE461F15039823003ABA7C /* PearlUIUtils.m */; }; DAFE4A5415039824003ABA7C /* PearlValidatingTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE462015039823003ABA7C /* PearlValidatingTextField.h */; }; DAFE4A5515039824003ABA7C /* PearlValidatingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE462115039823003ABA7C /* PearlValidatingTextField.m */; }; - DAFE4A5615039824003ABA7C /* PearlWebViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE462215039823003ABA7C /* PearlWebViewController.h */; }; - DAFE4A5715039824003ABA7C /* PearlWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE462315039823003ABA7C /* PearlWebViewController.m */; }; DAFE4A5815039824003ABA7C /* UIImage+PearlScaling.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE4A1115039824003ABA7C /* UIImage+PearlScaling.h */; }; DAFE4A5915039824003ABA7C /* UIImage+PearlScaling.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE4A1215039824003ABA7C /* UIImage+PearlScaling.m */; }; DAFE4A5A1503982E003ABA7C /* Pearl.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAFE45FA15039823003ABA7C /* Pearl.strings */; }; @@ -1506,8 +1504,6 @@ DAFE461F15039823003ABA7C /* PearlUIUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlUIUtils.m; sourceTree = ""; }; DAFE462015039823003ABA7C /* PearlValidatingTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlValidatingTextField.h; sourceTree = ""; }; DAFE462115039823003ABA7C /* PearlValidatingTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlValidatingTextField.m; sourceTree = ""; }; - DAFE462215039823003ABA7C /* PearlWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlWebViewController.h; sourceTree = ""; }; - DAFE462315039823003ABA7C /* PearlWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlWebViewController.m; sourceTree = ""; }; DAFE462415039823003ABA7C /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; DAFE4A1115039824003ABA7C /* UIImage+PearlScaling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+PearlScaling.h"; sourceTree = ""; }; DAFE4A1215039824003ABA7C /* UIImage+PearlScaling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+PearlScaling.m"; sourceTree = ""; }; @@ -2926,8 +2922,6 @@ DAFE461F15039823003ABA7C /* PearlUIUtils.m */, DAFE462015039823003ABA7C /* PearlValidatingTextField.h */, DAFE462115039823003ABA7C /* PearlValidatingTextField.m */, - DAFE462215039823003ABA7C /* PearlWebViewController.h */, - DAFE462315039823003ABA7C /* PearlWebViewController.m */, DAFE462415039823003ABA7C /* README */, DAFE462515039823003ABA7C /* Resources */, DA250A16195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.h */, @@ -3040,7 +3034,6 @@ DAFE4A5015039824003ABA7C /* PearlUIDebug.h in Headers */, DAFE4A5215039824003ABA7C /* PearlUIUtils.h in Headers */, DAFE4A5415039824003ABA7C /* PearlValidatingTextField.h in Headers */, - DAFE4A5615039824003ABA7C /* PearlWebViewController.h in Headers */, DAFE4A5815039824003ABA7C /* UIImage+PearlScaling.h in Headers */, DAFE4A63150399FF003ABA7C /* PearlAppDelegate.h in Headers */, DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */, @@ -3210,6 +3203,7 @@ }; DA5BFA43147E415C00F98B1E = { DevelopmentTeam = HL3Q45LX9N; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 0; @@ -3710,7 +3704,6 @@ DAFE4A5315039824003ABA7C /* PearlUIUtils.m in Sources */, DAFE4A5515039824003ABA7C /* PearlValidatingTextField.m in Sources */, DAEC85B618E3DD9A007FC0DF /* PearlUINavigationBar.m in Sources */, - DAFE4A5715039824003ABA7C /* PearlWebViewController.m in Sources */, DACE2F6C19BA6A2A0010F92E /* PearlMutableStaticTableViewController.m in Sources */, DAFE4A5915039824003ABA7C /* UIImage+PearlScaling.m in Sources */, DAFE4A62150399FF003ABA7C /* PearlAppDelegate.m in Sources */, @@ -3846,7 +3839,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DSTROOT = "/tmp/${PRODUCT_NAME}.dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3937,7 +3929,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DSTROOT = "/tmp/${PRODUCT_NAME}.dst"; ENABLE_NS_ASSERTIONS = NO; @@ -4006,7 +3997,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; - DEVELOPMENT_TEAM = HL3Q45LX9N; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/External/iOS\"", @@ -4030,7 +4021,6 @@ "-lopensslcrypto-ios-sim", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; - PROVISIONING_PROFILE_SPECIFIER = "Master Password Development"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; @@ -4043,6 +4033,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; DEVELOPMENT_TEAM = HL3Q45LX9N; EXCLUDED_SOURCE_FILE_NAMES = libDCIntrospect.a; @@ -4069,7 +4060,6 @@ "-lopensslcrypto-ios-sim", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; - PROVISIONING_PROFILE_SPECIFIER = "Master Password Ad Hoc"; SKIP_INSTALL = NO; STRIP_INSTALLED_PRODUCT = YES; TARGETED_DEVICE_FAMILY = 1; @@ -4107,7 +4097,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DSTROOT = "/tmp/${PRODUCT_NAME}.dst"; ENABLE_NS_ASSERTIONS = NO; @@ -4176,6 +4165,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; DEVELOPMENT_TEAM = HL3Q45LX9N; EXCLUDED_SOURCE_FILE_NAMES = libDCIntrospect.a; @@ -4202,7 +4192,6 @@ "-lopensslcrypto-ios-sim", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; - PROVISIONING_PROFILE_SPECIFIER = "Master Password App Store"; SKIP_INSTALL = NO; STRIP_INSTALLED_PRODUCT = YES; TARGETED_DEVICE_FAMILY = 1; diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme b/platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS: App Store.xcscheme similarity index 100% rename from platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme rename to platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS: App Store.xcscheme diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme b/platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS: Development.xcscheme similarity index 100% rename from platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme rename to platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS: Development.xcscheme diff --git a/platform-darwin/MasterPassword-Mac.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj similarity index 99% rename from platform-darwin/MasterPassword-Mac.xcodeproj/project.pbxproj rename to platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index 43fbde50..0428d1bb 100644 --- a/platform-darwin/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -2040,7 +2040,7 @@ }; }; }; - buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */; + buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-macOS" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; @@ -2855,7 +2855,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */ = { + DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( DA5BFA6B147E415C00F98B1E /* Debug-Mac */, diff --git a/platform-darwin/MasterPassword-Mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform-darwin/MasterPassword-macOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from platform-darwin/MasterPassword-Mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to platform-darwin/MasterPassword-macOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/platform-darwin/MasterPassword-Mac.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/platform-darwin/MasterPassword-macOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from platform-darwin/MasterPassword-Mac.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to platform-darwin/MasterPassword-macOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: App Store.xcscheme similarity index 90% rename from platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme rename to platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: App Store.xcscheme index 80cba6ea..467256f4 100644 --- a/platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: App Store.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -58,7 +58,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -77,7 +77,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> diff --git a/platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: Development.xcscheme similarity index 91% rename from platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme rename to platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: Development.xcscheme index dbf9cad8..468f1edb 100644 --- a/platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS: Development.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -58,7 +58,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -84,7 +84,7 @@ BlueprintIdentifier = "DA5BFA43147E415C00F98B1E" BuildableName = "Master Password.app" BlueprintName = "MasterPassword" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> diff --git a/platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme similarity index 90% rename from platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme rename to platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme index 5ad7703d..edcdf447 100644 --- a/platform-darwin/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "DA67743A1A474A03004F356A" BuildableName = "mpw-test" BlueprintName = "mpw-test" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "DA67743A1A474A03004F356A" BuildableName = "mpw-test" BlueprintName = "mpw-test" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -58,7 +58,7 @@ BlueprintIdentifier = "DA67743A1A474A03004F356A" BuildableName = "mpw-test" BlueprintName = "mpw-test" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> @@ -77,7 +77,7 @@ BlueprintIdentifier = "DA67743A1A474A03004F356A" BuildableName = "mpw-test" BlueprintName = "mpw-test" - ReferencedContainer = "container:MasterPassword-Mac.xcodeproj"> + ReferencedContainer = "container:MasterPassword-macOS.xcodeproj"> diff --git a/platform-darwin/MasterPassword.xcworkspace/contents.xcworkspacedata b/platform-darwin/MasterPassword.xcworkspace/contents.xcworkspacedata index d9b39f43..e12bb5b7 100644 --- a/platform-darwin/MasterPassword.xcworkspace/contents.xcworkspacedata +++ b/platform-darwin/MasterPassword.xcworkspace/contents.xcworkspacedata @@ -5,6 +5,6 @@ location = "group:MasterPassword-iOS.xcodeproj"> + location = "group:/Users/lhunath/Documents/workspace/lyndir/MasterPassword/platform-darwin/MasterPassword-macOS.xcodeproj"> diff --git a/platform-darwin/Source/iOS/MPPasswordsViewController.m b/platform-darwin/Source/iOS/MPPasswordsViewController.m index a75b0d3c..1dfe185d 100644 --- a/platform-darwin/Source/iOS/MPPasswordsViewController.m +++ b/platform-darwin/Source/iOS/MPPasswordsViewController.m @@ -122,11 +122,10 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) { ((MPMessageViewController *)segue.destinationViewController).message = sender; } -- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { +- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { [self.passwordCollectionView.collectionViewLayout invalidateLayout]; - - [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration]; + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; } #pragma mark - UICollectionViewDelegateFlowLayout diff --git a/platform-darwin/Source/iOS/MPUsersViewController.m b/platform-darwin/Source/iOS/MPUsersViewController.m index 2190c7fb..c5f09a0d 100644 --- a/platform-darwin/Source/iOS/MPUsersViewController.m +++ b/platform-darwin/Source/iOS/MPUsersViewController.m @@ -118,11 +118,10 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) { [super viewWillLayoutSubviews]; } -- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { - - [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; +- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { [self.avatarCollectionView.collectionViewLayout invalidateLayout]; + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; } - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {