兼容 xcode 9，移除警告

Tiaotiaotiao · Sep 25, 2017 · c3860a2 · c3860a2
1 parent 907d841
commit c3860a2
Show file tree

Hide file tree

Showing 33 changed files with 505 additions and 257 deletions.
diff --git a/Cocoa/AppFrameworks/Foundation/DictionaryModel/NSObject+YJNSDictionaryModel.m b/Cocoa/AppFrameworks/Foundation/DictionaryModel/NSObject+YJNSDictionaryModel.m
@@ -202,7 +202,7 @@ + (YJNSDictionaryModelProperty *)getModelProperty:(objc_property_t)property dict
     }
     // immutable classes: NSNumber, NSString, NSURL, NSArray, NSDictionary
     if (attributeItems.count == 3) {
-        p.attributeClass = YJNSDMPAttributeTypeNumber;
+        p.attributeType = YJNSDMPAttributeTypeNumber;
     } else if (attributeItems.count == 4) {
         NSScanner *scanner = [NSScanner scannerWithString:propertyAttributes];
         if ([scanner scanString:@"T@\"" intoString:nil]) {

diff --git a/Cocoa/AppFrameworks/Foundation/Router/Header/YJNSRouterHeader.h b/Cocoa/AppFrameworks/Foundation/Router/Header/YJNSRouterHeader.h
@@ -9,6 +9,8 @@
 //  Copyright © 2016年 YJCocoa. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NSString * YJNSRouterURL NS_STRING_ENUM; ///< 路由地址
 typedef NSString * YJNSRouterOptionsKey NS_STRING_ENUM; ///< 路由参数Key
 typedef NSString * YJNSRouterFoundationID NS_STRING_ENUM; ///< 路由功能ID
@@ -18,6 +20,8 @@ typedef NSString * YJNSRouterFoundationID NS_STRING_ENUM; ///< 路由功能ID
 /** 路由代理*/
 @protocol YJNSRouterDelegate <NSObject>
 
+@optional
+
 /**
  *  @abstract 初始化
  *
@@ -47,4 +51,5 @@ typedef NSString * YJNSRouterFoundationID NS_STRING_ENUM; ///< 路由功能ID
 
 @end
 
+NS_ASSUME_NONNULL_END
 
diff --git a/Cocoa/AppFrameworks/UIKit/AutoLayout/Extend/YJNSLayoutConstraintAnimate.h b/Cocoa/AppFrameworks/UIKit/AutoLayout/Extend/YJNSLayoutConstraintAnimate.h
@@ -13,7 +13,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^ YJTConstraintAnimateCompletion)();
+typedef void (^ YJTConstraintAnimateCompletion)(void);
 
 /** 约束动画携带的参数*/
 @interface YJNSLayoutConstraintAnimate : NSObject

diff --git a/Cocoa/AppFrameworks/UIKit/AutoLayout/LayoutAnchor/YJNSLayoutDimension.h b/Cocoa/AppFrameworks/UIKit/AutoLayout/LayoutAnchor/YJNSLayoutDimension.h
@@ -21,7 +21,7 @@ typedef NSLayoutConstraint * _Nonnull (^ EqualToConstant)(CGFloat constant);
 /** NSLayoutConstraint.relation = NSLayoutRelationGreaterThanOrEqual and .constant = constant*/
 typedef NSLayoutConstraint * _Nonnull (^ GreaterThanOrEqualToConstant)(CGFloat constant);
 /** 快速查询约束*/
-typedef NSLayoutConstraint * __nullable (^ Constraint)();
+typedef NSLayoutConstraint * __nullable (^ Constraint)(void);
 
 /** YJNSLayoutDimension对应的协议*/
 @protocol YJNSLayoutDimensionProtocol <YJNSLayoutAnchorProtocol>

diff --git a/Cocoa/AppFrameworks/UIKit/AutoLayout/LayoutAnchor/YJNSLayoutDimension.m b/Cocoa/AppFrameworks/UIKit/AutoLayout/LayoutAnchor/YJNSLayoutDimension.m
@@ -40,7 +40,7 @@ - (GreaterThanOrEqualToConstant)greaterThanOrEqualToConstant {
 
 - (Constraint)constraint {
     __weak YJNSLayoutAnchor *wSelf = self;
-    Constraint block = ^ () {
+    Constraint block = ^ (void) {
         return [NSLayoutConstraint findConstraintWithItem:wSelf.item attribute:wSelf.attribute toItem:nil attribute:NSLayoutAttributeNotAnAttribute];
     };
     return block;

diff --git a/Cocoa/AppFrameworks/UIKit/AutoLayout/LayoutAnchor/YJUILayoutSupport.h b/Cocoa/AppFrameworks/UIKit/AutoLayout/LayoutAnchor/YJUILayoutSupport.h
@@ -11,6 +11,8 @@
 
 #import "YJNSLayoutYAxisAnchor.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /** 仿UILayoutSupport*/
 NS_CLASS_AVAILABLE_IOS(7_0)
 @interface YJUILayoutSupport : NSObject
@@ -30,3 +32,5 @@ NS_CLASS_AVAILABLE_IOS(7_0)
 - (instancetype)initWithItem:(id<UILayoutSupport>)layoutGuide;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Developer/AppFrameworks/UIKit/YJAutoLayout/YJAutoLayout.xcodeproj/project.pbxproj b/Developer/AppFrameworks/UIKit/YJAutoLayout/YJAutoLayout.xcodeproj/project.pbxproj
@@ -210,7 +210,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = YJ;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = YJ;
 				TargetAttributes = {
 					846590701CC9F6FC0068F6D8 = {
@@ -301,14 +301,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -348,14 +354,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -388,7 +400,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = PC936H3Q67;
 				INFOPLIST_FILE = YJAutoLayout/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jumei.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -403,7 +415,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = PC936H3Q67;
 				INFOPLIST_FILE = YJAutoLayout/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jumei.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/...ameworks/UIKit/YJAutoLayout/YJAutoLayout/Assets.xcassets/AppIcon.appiconset/Contents.json b/...ameworks/UIKit/YJAutoLayout/YJAutoLayout/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -133,6 +133,11 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Developer/AppFrameworks/UIKit/YJCollectionView/Podfile b/Developer/AppFrameworks/UIKit/YJCollectionView/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '7.0'
+platform :ios, '8.0'
 # Uncomment this line if you're using Swift
 # use_frameworks!
 

diff --git a/Developer/AppFrameworks/UIKit/YJCollectionView/Podfile.lock b/Developer/AppFrameworks/UIKit/YJCollectionView/Podfile.lock
@@ -1,20 +1,20 @@
 PODS:
-  - YJCocoa/AppFrameworks/Foundation/AOP (6.4.0)
-  - YJCocoa/AppFrameworks/Foundation/Other (6.4.0)
-  - YJCocoa/AppFrameworks/UIKit/ScrollViewManager (6.4.0):
+  - YJCocoa/AppFrameworks/Foundation/AOP (6.6.0)
+  - YJCocoa/AppFrameworks/Foundation/Other (6.6.0)
+  - YJCocoa/AppFrameworks/UIKit/ScrollViewManager (6.6.0):
     - YJCocoa/AppFrameworks/Foundation/AOP
     - YJCocoa/AppFrameworks/UIKit/ViewGeometry
-  - YJCocoa/AppFrameworks/UIKit/ViewGeometry (6.4.0)
-  - YJCocoa/System/Dispatch (6.4.0)
+  - YJCocoa/AppFrameworks/UIKit/ViewGeometry (6.6.0)
+  - YJCocoa/System/Dispatch (6.6.0)
 
 DEPENDENCIES:
   - YJCocoa/AppFrameworks/Foundation/Other
   - YJCocoa/AppFrameworks/UIKit/ScrollViewManager
   - YJCocoa/System/Dispatch
 
 SPEC CHECKSUMS:
-  YJCocoa: 6f035007cb154b26bbbb1f084181d5e163807eb9
+  YJCocoa: 28e1ffd02138071c60995f43a064d6032b5004e2
 
-PODFILE CHECKSUM: 95d55a086d1cb04bebf1eaec3395f35a7157b621
+PODFILE CHECKSUM: 9322b2f9d3442c4f94ea36cd5f3a01cf478876eb
 
-COCOAPODS: 1.2.1
+COCOAPODS: 1.3.1
diff --git a/Developer/AppFrameworks/UIKit/YJCollectionView/Pods/Manifest.lock b/Developer/AppFrameworks/UIKit/YJCollectionView/Pods/Manifest.lock