From 672944b7c5e6230a9eaac1af2f8f300345462a3a Mon Sep 17 00:00:00 2001 From: michael starke Date: Mon, 14 Nov 2016 19:10:06 +0100 Subject: [PATCH] Using -Wpartial-availability instead of custom avaiablity header --- MacPass.xcodeproj/project.pbxproj | 4 +- MacPass/MJGAvailability.h | 225 ------------------------------ MacPass/MacPass-Prefix.pch | 2 - 3 files changed, 2 insertions(+), 229 deletions(-) delete mode 100644 MacPass/MJGAvailability.h diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index dae6b605..4a304b72 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -490,7 +490,6 @@ 4C7155E81A10DB7700979307 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/IconSelection.strings; sourceTree = ""; }; 4C7155EA1A10DB7800979307 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/IconSelection.strings; sourceTree = ""; }; 4C7155EC1A10DB7900979307 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IconSelection.strings; sourceTree = ""; }; - 4C725F3F19EEF4FC00191B01 /* MJGAvailability.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MJGAvailability.h; sourceTree = ""; }; 4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralSettings.xib; sourceTree = ""; }; 4C7615601764C05A0015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 4C76156B1764C0C80015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordInputView.xib; sourceTree = ""; }; @@ -894,7 +893,6 @@ 4C217D8E17A32BCF00609FAA /* Common */ = { isa = PBXGroup; children = ( - 4C725F3F19EEF4FC00191B01 /* MJGAvailability.h */, 4C569D9C17652AC800595B62 /* MPConstants.h */, 4C569D9D17652B0600595B62 /* MPConstants.m */, 4CCEDE2C179F2122008402BE /* MPNotifications.h */, @@ -2241,6 +2239,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lxml2"; SDKROOT = macosx; + WARNING_CFLAGS = "-Wpartial-availability"; }; name = Debug; }; @@ -2277,6 +2276,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_LDFLAGS = "-lxml2"; SDKROOT = macosx; + WARNING_CFLAGS = "-Wpartial-availability"; }; name = Release; }; diff --git a/MacPass/MJGAvailability.h b/MacPass/MJGAvailability.h deleted file mode 100644 index eb35d97c..00000000 --- a/MacPass/MJGAvailability.h +++ /dev/null @@ -1,225 +0,0 @@ -// -// MJGImageLoader.h -// MJGFoundation -// -// Created by Matt Galloway on 18/01/2012. -// Copyright 2012 Matt Galloway. All rights reserved. -// - -/** - * Example usage: - * If you want to see if you're using methods that are only defined in iOS 4.0 and lower - * then you would use the following. Replace the __IPHONE_4_0 with whatever other macro - * you require. See Availability.h for iOS versions these relate to. - * - * YourProjectPrefixHeader.pch: - * #define __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED __IPHONE_4_0 - * #import "MJGAvailability.h" - * - * // The rest of your prefix header as normal - * #import - * - * For OSX, you also get the warnings: - * - * YourOSXPrefixHeader.pch - * #define __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED __MAC_10_7 - * #import "MJGAvailability.h" - * - * If you want to suppress a single warning (i.e. because you know that what you're doing is - * actually OK) then you can do something like this: - * - * UINavigationBar *navBar = self.navigationController.navigationBar; - * if ([navBar respondsToSelector:@selector(setBackgroundImage:forBarMetrics:)]) { - * #pragma clang diagnostic push - * #pragma clang diagnostic ignored "-Wdeprecated-declarations" - * [navBar setBackgroundImage:[UIImage imageNamed:@"navbar_bg.png"] forBarMetrics:UIBarMetricsDefault]; - * #pragma clang diagnostic pop - * } - * - * Or you can use the handy macros defined in this file also, like this: - * - * UINavigationBar *navBar = self.navigationController.navigationBar; - * if ([navBar respondsToSelector:@selector(setBackgroundImage:forBarMetrics:)]) { - * MJG_START_IGNORE_TOO_NEW - * [navBar setBackgroundImage:[UIImage imageNamed:@"navbar_bg.png"] forBarMetrics:UIBarMetricsDefault]; - * MJG_END_IGNORE_TOO_NEW - * } - * - */ - -#import - -#define MJG_START_IGNORE_TOO_NEW _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#define MJG_END_IGNORE_TOO_NEW _Pragma("clang diagnostic pop") - -#define __AVAILABILITY_TOO_NEW __attribute__((deprecated("TOO NEW!"))) __attribute__((weak_import)) - -#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) - -#ifndef __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED -#define __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED __IPHONE_OS_VERSION_MIN_REQUIRED -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_OS_VERSION_MIN_REQUIRED - #error You cannot ask for a soft max version which is less than the deployment target -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_2_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_2_0 - #define __AVAILABILITY_INTERNAL__IPHONE_2_0 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_2_1 - #undef __AVAILABILITY_INTERNAL__IPHONE_2_1 - #define __AVAILABILITY_INTERNAL__IPHONE_2_1 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_2_2 - #undef __AVAILABILITY_INTERNAL__IPHONE_2_2 - #define __AVAILABILITY_INTERNAL__IPHONE_2_2 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_3_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_3_0 - #define __AVAILABILITY_INTERNAL__IPHONE_3_0 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_3_1 - #undef __AVAILABILITY_INTERNAL__IPHONE_3_1 - #define __AVAILABILITY_INTERNAL__IPHONE_3_1 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_3_2 - #undef __AVAILABILITY_INTERNAL__IPHONE_3_2 - #define __AVAILABILITY_INTERNAL__IPHONE_3_2 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_4_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_4_0 - #define __AVAILABILITY_INTERNAL__IPHONE_4_0 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_4_1 - #undef __AVAILABILITY_INTERNAL__IPHONE_4_1 - #define __AVAILABILITY_INTERNAL__IPHONE_4_1 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_4_2 - #undef __AVAILABILITY_INTERNAL__IPHONE_4_2 - #define __AVAILABILITY_INTERNAL__IPHONE_4_2 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_4_3 - #undef __AVAILABILITY_INTERNAL__IPHONE_4_3 - #define __AVAILABILITY_INTERNAL__IPHONE_4_3 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_5_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_5_0 - #define __AVAILABILITY_INTERNAL__IPHONE_5_0 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_5_1 - #undef __AVAILABILITY_INTERNAL__IPHONE_5_1 - #define __AVAILABILITY_INTERNAL__IPHONE_5_1 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_6_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_6_0 - #define __AVAILABILITY_INTERNAL__IPHONE_6_0 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_6_1 - #undef __AVAILABILITY_INTERNAL__IPHONE_6_1 - #define __AVAILABILITY_INTERNAL__IPHONE_6_1 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_7_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_7_0 - #define __AVAILABILITY_INTERNAL__IPHONE_7_0 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_7_1 - #undef __AVAILABILITY_INTERNAL__IPHONE_7_1 - #define __AVAILABILITY_INTERNAL__IPHONE_7_1 __AVAILABILITY_TOO_NEW -#endif - -#if __IPHONE_OS_VERSION_SOFT_MAX_REQUIRED < __IPHONE_8_0 - #undef __AVAILABILITY_INTERNAL__IPHONE_8_0 - #define __AVAILABILITY_INTERNAL__IPHONE_8_0 __AVAILABILITY_TOO_NEW -#endif - -#endif // end of #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) - -#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) - -#ifndef __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED -#define __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED __MAC_OS_X_VERSION_MIN_REQUIRED -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_OS_X_VERSION_MIN_REQUIRED -#error You cannot ask for a soft max version which is less than the deployment target -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_0 -#undef __AVAILABILITY_INTERNAL__MAC_10_0 -#define __AVAILABILITY_INTERNAL__MAC_10_0 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_1 -#undef __AVAILABILITY_INTERNAL__MAC_10_1 -#define __AVAILABILITY_INTERNAL__MAC_10_1 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_2 -#undef __AVAILABILITY_INTERNAL__MAC_10_2 -#define __AVAILABILITY_INTERNAL__MAC_10_2 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_3 -#undef __AVAILABILITY_INTERNAL__MAC_10_3 -#define __AVAILABILITY_INTERNAL__MAC_10_3 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_4 -#undef __AVAILABILITY_INTERNAL__MAC_10_4 -#define __AVAILABILITY_INTERNAL__MAC_10_4 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_5 -#undef __AVAILABILITY_INTERNAL__MAC_10_5 -#define __AVAILABILITY_INTERNAL__MAC_10_5 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_6 -#undef __AVAILABILITY_INTERNAL__MAC_10_6 -#define __AVAILABILITY_INTERNAL__MAC_10_6 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_7 -#undef __AVAILABILITY_INTERNAL__MAC_10_7 -#define __AVAILABILITY_INTERNAL__MAC_10_7 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_8 -#undef __AVAILABILITY_INTERNAL__MAC_10_8 -#define __AVAILABILITY_INTERNAL__MAC_10_8 __AVAILABILITY_TOO_NEW -#endif - -#if __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED < __MAC_10_9 -#undef __AVAILABILITY_INTERNAL__MAC_10_9 -#define __AVAILABILITY_INTERNAL__MAC_10_9 __AVAILABILITY_TOO_NEW -#endif - -#endif // end of #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) - -#if (defined(__IPHONE_7_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0) || (defined(__MAC_10_9) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_9) -#include -#undef CF_AVAILABLE -#define CF_AVAILABLE(_mac, _ios) __OSX_AVAILABLE_STARTING(__MAC_##_mac, __IPHONE_##_ios) -#undef CF_AVAILABLE_MAC -#define CF_AVAILABLE_MAC(_mac) __OSX_AVAILABLE_STARTING(__MAC_##_mac, __IPHONE_NA) -#undef CF_AVAILABLE_IOS -#define CF_AVAILABLE_IOS(_ios) __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_##_ios) -#endif // if iOS SDK >= 7.0 || OSX SDK >= 10.9 - diff --git a/MacPass/MacPass-Prefix.pch b/MacPass/MacPass-Prefix.pch index b6f3d873..ef5ac8ee 100644 --- a/MacPass/MacPass-Prefix.pch +++ b/MacPass/MacPass-Prefix.pch @@ -3,7 +3,5 @@ // #ifdef __OBJC__ - #define __MAC_OS_X_VERSION_SOFT_MAX_REQUIRED __MAC_10_9 - #import "MJGAvailability.h" #import #endif