diff --git a/Framework/YYCache.xcodeproj/project.pbxproj b/Framework/YYCache.xcodeproj/project.pbxproj index b5aa628..de9be0c 100644 --- a/Framework/YYCache.xcodeproj/project.pbxproj +++ b/Framework/YYCache.xcodeproj/project.pbxproj @@ -139,7 +139,7 @@ D93C45A31F05445A009F80F9 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1320; ORGANIZATIONNAME = ibireme; TargetAttributes = { D93C45AB1F05445A009F80F9 = { @@ -153,6 +153,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = D93C45A21F05445A009F80F9; productRefGroup = D93C45AD1F05445A009F80F9 /* Products */; @@ -203,6 +204,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -210,8 +212,10 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; 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_MOVE = YES; @@ -261,6 +265,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -268,8 +273,10 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; 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_MOVE = YES; diff --git a/Framework/YYCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Framework/YYCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Framework/YYCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Framework/YYCache.xcodeproj/xcshareddata/xcschemes/YYCache.xcscheme b/Framework/YYCache.xcodeproj/xcshareddata/xcschemes/YYCache.xcscheme index 7cf8948..c9e343a 100644 --- a/Framework/YYCache.xcodeproj/xcshareddata/xcschemes/YYCache.xcscheme +++ b/Framework/YYCache.xcodeproj/xcshareddata/xcschemes/YYCache.xcscheme @@ -1,7 +1,7 @@ + LastUpgradeVersion = "1320" + version = "1.3"> @@ -26,12 +26,9 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - object) { - if (object && ![_memoryCache objectForKey:key]) { - [_memoryCache setObject:object forKey:key]; + if (object && ![self->_memoryCache objectForKey:key]) { + [self->_memoryCache setObject:object forKey:key]; } block(key, object); }]; diff --git a/YYCache/YYDiskCache.m b/YYCache/YYDiskCache.m index 735cc5d..528c906 100644 --- a/YYCache/YYDiskCache.m +++ b/YYCache/YYDiskCache.m @@ -343,7 +343,7 @@ - (void)removeAllObjectsWithProgressBlock:(void(^)(int removedCount, int totalCo return; } Lock(); - [_kv removeAllItemsWithProgressBlock:progress endBlock:end]; + [self->_kv removeAllItemsWithProgressBlock:progress endBlock:end]; Unlock(); }); } diff --git a/YYCache/YYMemoryCache.m b/YYCache/YYMemoryCache.m index 9042d9b..57bfe75 100644 --- a/YYCache/YYMemoryCache.m +++ b/YYCache/YYMemoryCache.m @@ -436,7 +436,7 @@ - (void)setObject:(id)object forKey:(id)key withCost:(NSUInteger)cost { } if (_lru->_totalCost > _costLimit) { dispatch_async(_queue, ^{ - [self trimToCost:_costLimit]; + [self trimToCost:self->_costLimit]; }); } if (_lru->_totalCount > _countLimit) {