Skip to content

Commit 7705ff8

Browse files
wolfconwolfcon
authored
Remove deprecated code (#1498)
1 parent 7ce762d commit 7705ff8

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

‎MJRefreshExample.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@
622622
isa = PBXProject;
623623
attributes = {
624624
CLASSPREFIX = MJ;
625-
LastUpgradeCheck = 0700;
625+
LastUpgradeCheck = 1220;
626626
ORGANIZATIONNAME = "小码哥";
627627
TargetAttributes = {
628628
2D9DF4511F7CE29B0042D6DD = {
@@ -822,7 +822,7 @@
822822
CLANG_WARN_STRICT_PROTOTYPES = YES;
823823
CLANG_WARN_SUSPICIOUS_MOVE = YES;
824824
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
825-
CODE_SIGN_IDENTITY = "iPhone Developer";
825+
CODE_SIGN_IDENTITY = "";
826826
CODE_SIGN_STYLE = Automatic;
827827
CURRENT_PROJECT_VERSION = 1;
828828
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -834,7 +834,6 @@
834834
GCC_NO_COMMON_BLOCKS = YES;
835835
INFOPLIST_FILE = MJRefreshFramework/Info.plist;
836836
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
837-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
838837
LD_RUNPATH_SEARCH_PATHS = (
839838
"$(inherited)",
840839
"@executable_path/Frameworks",
@@ -866,7 +865,7 @@
866865
CLANG_WARN_STRICT_PROTOTYPES = YES;
867866
CLANG_WARN_SUSPICIOUS_MOVE = YES;
868867
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
869-
CODE_SIGN_IDENTITY = "iPhone Developer";
868+
CODE_SIGN_IDENTITY = "";
870869
CODE_SIGN_STYLE = Automatic;
871870
COPY_PHASE_STRIP = NO;
872871
CURRENT_PROJECT_VERSION = 1;
@@ -879,7 +878,6 @@
879878
GCC_NO_COMMON_BLOCKS = YES;
880879
INFOPLIST_FILE = MJRefreshFramework/Info.plist;
881880
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
882-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
883881
LD_RUNPATH_SEARCH_PATHS = (
884882
"$(inherited)",
885883
"@executable_path/Frameworks",
@@ -903,13 +901,24 @@
903901
CLANG_CXX_LIBRARY = "libc++";
904902
CLANG_ENABLE_MODULES = YES;
905903
CLANG_ENABLE_OBJC_ARC = YES;
904+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
906905
CLANG_WARN_BOOL_CONVERSION = YES;
906+
CLANG_WARN_COMMA = YES;
907907
CLANG_WARN_CONSTANT_CONVERSION = YES;
908+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
908909
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
909910
CLANG_WARN_EMPTY_BODY = YES;
910911
CLANG_WARN_ENUM_CONVERSION = YES;
912+
CLANG_WARN_INFINITE_RECURSION = YES;
911913
CLANG_WARN_INT_CONVERSION = YES;
914+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
915+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
916+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
912917
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
918+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
919+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
920+
CLANG_WARN_STRICT_PROTOTYPES = YES;
921+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
913922
CLANG_WARN_UNREACHABLE_CODE = YES;
914923
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
915924
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -918,6 +927,7 @@
918927
ENABLE_TESTABILITY = YES;
919928
GCC_C_LANGUAGE_STANDARD = gnu99;
920929
GCC_DYNAMIC_NO_PIC = NO;
930+
GCC_NO_COMMON_BLOCKS = YES;
921931
GCC_OPTIMIZATION_LEVEL = 0;
922932
GCC_PREPROCESSOR_DEFINITIONS = (
923933
"DEBUG=1",
@@ -930,7 +940,7 @@
930940
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
931941
GCC_WARN_UNUSED_FUNCTION = YES;
932942
GCC_WARN_UNUSED_VARIABLE = YES;
933-
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
943+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
934944
MTL_ENABLE_DEBUG_INFO = YES;
935945
ONLY_ACTIVE_ARCH = YES;
936946
SDKROOT = iphoneos;
@@ -946,27 +956,39 @@
946956
CLANG_CXX_LIBRARY = "libc++";
947957
CLANG_ENABLE_MODULES = YES;
948958
CLANG_ENABLE_OBJC_ARC = YES;
959+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
949960
CLANG_WARN_BOOL_CONVERSION = YES;
961+
CLANG_WARN_COMMA = YES;
950962
CLANG_WARN_CONSTANT_CONVERSION = YES;
963+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
951964
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
952965
CLANG_WARN_EMPTY_BODY = YES;
953966
CLANG_WARN_ENUM_CONVERSION = YES;
967+
CLANG_WARN_INFINITE_RECURSION = YES;
954968
CLANG_WARN_INT_CONVERSION = YES;
969+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
970+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
971+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
955972
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
973+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
974+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
975+
CLANG_WARN_STRICT_PROTOTYPES = YES;
976+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
956977
CLANG_WARN_UNREACHABLE_CODE = YES;
957978
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
958979
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
959980
COPY_PHASE_STRIP = YES;
960981
ENABLE_NS_ASSERTIONS = NO;
961982
ENABLE_STRICT_OBJC_MSGSEND = YES;
962983
GCC_C_LANGUAGE_STANDARD = gnu99;
984+
GCC_NO_COMMON_BLOCKS = YES;
963985
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
964986
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
965987
GCC_WARN_UNDECLARED_SELECTOR = YES;
966988
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
967989
GCC_WARN_UNUSED_FUNCTION = YES;
968990
GCC_WARN_UNUSED_VARIABLE = YES;
969-
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
991+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
970992
MTL_ENABLE_DEBUG_INFO = NO;
971993
SDKROOT = iphoneos;
972994
TARGETED_DEVICE_FAMILY = "1,2";
@@ -982,7 +1004,6 @@
9821004
DEVELOPMENT_TEAM = "";
9831005
GCC_PREFIX_HEADER = MJRefreshExample/PrefixHeader.pch;
9841006
INFOPLIST_FILE = MJRefreshExample/Info.plist;
985-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
9861007
LD_RUNPATH_SEARCH_PATHS = (
9871008
"$(inherited)",
9881009
"@executable_path/Frameworks",
@@ -1000,7 +1021,6 @@
10001021
DEVELOPMENT_TEAM = "";
10011022
GCC_PREFIX_HEADER = MJRefreshExample/PrefixHeader.pch;
10021023
INFOPLIST_FILE = MJRefreshExample/Info.plist;
1003-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
10041024
LD_RUNPATH_SEARCH_PATHS = (
10051025
"$(inherited)",
10061026
"@executable_path/Frameworks",

‎MJRefreshExample.xcodeproj/xcshareddata/xcschemes/MJRefreshFramework.xcscheme‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,18 +26,14 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
33-
<AdditionalOptions>
34-
</AdditionalOptions>
3532
</TestAction>
3633
<LaunchAction
3734
buildConfiguration = "Debug"
3835
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3936
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4137
launchStyle = "0"
4238
useCustomWorkingDirectory = "NO"
4339
ignoresPersistentStateOnLaunch = "NO"
@@ -53,8 +49,6 @@
5349
ReferencedContainer = "container:MJRefreshExample.xcodeproj">
5450
</BuildableReference>
5551
</MacroExpansion>
56-
<AdditionalOptions>
57-
</AdditionalOptions>
5852
</LaunchAction>
5953
<ProfileAction
6054
buildConfiguration = "Release"

‎MJRefreshExample/Classes/First/MJNavigationController.m‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,19 @@
77
//
88

99
#import "MJNavigationController.h"
10-
// 判断是否为iOS7
11-
#define iOS7 ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0)
1210

1311
@implementation MJNavigationController
1412

1513
#pragma mark 一个类只会调用一次
1614
+ (void)initialize
1715
{
1816
// 1.取出设置主题的对象
19-
UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedIn:[MJNavigationController class], nil];
17+
UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[MJNavigationController.class]];
2018

2119
// 2.设置导航栏的背景图片
22-
NSString *navBarBg = nil;
23-
if (iOS7) { // iOS7
24-
navBarBg = @"NavBar64";
25-
navBar.tintColor = [UIColor whiteColor];
26-
} else { // 非iOS7
27-
navBarBg = @"NavBar";
28-
}
29-
[navBar setBackgroundImage:[UIImage imageNamed:navBarBg] forBarMetrics:UIBarMetricsDefault];
20+
[navBar setBackgroundImage:[UIImage imageNamed:@"NavBar64"] forBarMetrics:UIBarMetricsDefault];
3021

3122
// 3.标题
32-
#ifdef __IPHONE_7_0
3323
[navBar setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
34-
#else
35-
[navBar setTitleTextAttributes:@{UITextAttributeTextColor : [UIColor whiteColor]}];
36-
#endif
3724
}
3825
@end

0 commit comments

Comments
 (0)