From 4831bd2d4fc425457e0266d4a77dd864a3d82844 Mon Sep 17 00:00:00 2001 From: boych Date: Tue, 7 Jun 2016 23:17:21 +0800 Subject: [PATCH] update pods --- JCNetworking.podspec | 12 +- Podfile | 2 +- Podfile.lock | 4 +- Pods/Manifest.lock | 4 +- Pods/Masonry/Masonry/MASConstraint.h | 7 + Pods/Masonry/Masonry/MASConstraint.m | 11 + Pods/Masonry/Masonry/MASConstraintMaker.h | 14 + Pods/Masonry/Masonry/MASConstraintMaker.m | 23 + Pods/Masonry/Masonry/NSArray+MASAdditions.m | 8 +- .../NSLayoutConstraint+MASDebugAdditions.m | 5 + Pods/Masonry/Masonry/View+MASAdditions.h | 7 + Pods/Masonry/Masonry/View+MASAdditions.m | 11 + .../Masonry/View+MASShorthandAdditions.h | 14 + Pods/Pods.xcodeproj/project.pbxproj | 904 +++++++++--------- 14 files changed, 558 insertions(+), 468 deletions(-) diff --git a/JCNetworking.podspec b/JCNetworking.podspec index f195d9a..bdbc5c4 100644 --- a/JCNetworking.podspec +++ b/JCNetworking.podspec @@ -1,16 +1,14 @@ Pod::Spec.new do |s| - s.name = 'JCNetworking' s.version = '0.0.1' s.license = 'MIT' s.summary = 'A useful iOS networking framework based on AFNetworking and JSONModel.' s.homepage = 'https://github.com/boych/JCNetworking' - s.author = { 'boych' => 'ioschen@foxmail.com' } - s.source = { :git => 'https://github.com/boych/JCNetworking.git', :tag => s.version.to_s } - s.source_files = 'JCNetworking/*.{h,m}' - s.platform = :ios, '8.0' - s.requires_arc = true - s.public_header_files = 'JCNetworking/JCNetworking.h' + s.author = { 'ChenJianjun' => 'ioschen@foxmail.com' } + s.source = { :git => 'https://github.com/boych/JCNetworking.git', :tag => s.version.to_s } + s.source_files = 'JCNetworking/*.{h,m}' + s.platform = :ios, '7.0' + s.requires_arc = true s.dependency 'AFNetworking', '~> 3.1.0' s.dependency 'JSONModel', '~> 1.2.0' diff --git a/Podfile b/Podfile index 36ec26b..87932bc 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,4 @@ -platform :ios, '8.0' +platform :ios, '7.0' pod 'JSONModel', '~> 1.2.0' pod 'AFNetworking', '~> 3.1.0' pod 'Masonry' diff --git a/Podfile.lock b/Podfile.lock index c096354..101aa64 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -15,7 +15,7 @@ PODS: - AFNetworking/UIKit (3.1.0): - AFNetworking/NSURLSession - JSONModel (1.2.0) - - Masonry (1.0.0) + - Masonry (1.0.1) - ReactiveCocoa (2.5): - ReactiveCocoa/UI (= 2.5) - ReactiveCocoa/Core (2.5): @@ -33,7 +33,7 @@ DEPENDENCIES: SPEC CHECKSUMS: AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c - Masonry: b529bb169217897b6354d4b56b1fada6d475b13d + Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a COCOAPODS: 0.39.0 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index c096354..101aa64 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -15,7 +15,7 @@ PODS: - AFNetworking/UIKit (3.1.0): - AFNetworking/NSURLSession - JSONModel (1.2.0) - - Masonry (1.0.0) + - Masonry (1.0.1) - ReactiveCocoa (2.5): - ReactiveCocoa/UI (= 2.5) - ReactiveCocoa/Core (2.5): @@ -33,7 +33,7 @@ DEPENDENCIES: SPEC CHECKSUMS: AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c - Masonry: b529bb169217897b6354d4b56b1fada6d475b13d + Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a COCOAPODS: 0.39.0 diff --git a/Pods/Masonry/Masonry/MASConstraint.h b/Pods/Masonry/Masonry/MASConstraint.h index 655590b..70a10c8 100644 --- a/Pods/Masonry/Masonry/MASConstraint.h +++ b/Pods/Masonry/Masonry/MASConstraint.h @@ -127,6 +127,13 @@ - (MASConstraint *)centerY; - (MASConstraint *)baseline; +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +- (MASConstraint *)firstBaseline; +- (MASConstraint *)lastBaseline; + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV - (MASConstraint *)leftMargin; diff --git a/Pods/Masonry/Masonry/MASConstraint.m b/Pods/Masonry/Masonry/MASConstraint.m index 02d1f62..f24ec10 100644 --- a/Pods/Masonry/Masonry/MASConstraint.m +++ b/Pods/Masonry/Masonry/MASConstraint.m @@ -208,6 +208,17 @@ - (MASConstraint *)baseline { return [self addConstraintWithLayoutAttribute:NSLayoutAttributeBaseline]; } +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +- (MASConstraint *)firstBaseline { + return [self addConstraintWithLayoutAttribute:NSLayoutAttributeFirstBaseline]; +} +- (MASConstraint *)lastBaseline { + return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline]; +} + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV - (MASConstraint *)leftMargin { diff --git a/Pods/Masonry/Masonry/MASConstraintMaker.h b/Pods/Masonry/Masonry/MASConstraintMaker.h index ad9e702..8f72b4c 100644 --- a/Pods/Masonry/Masonry/MASConstraintMaker.h +++ b/Pods/Masonry/Masonry/MASConstraintMaker.h @@ -22,6 +22,13 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) { MASAttributeCenterY = 1 << NSLayoutAttributeCenterY, MASAttributeBaseline = 1 << NSLayoutAttributeBaseline, +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + + MASAttributeFirstBaseline = 1 << NSLayoutAttributeFirstBaseline, + MASAttributeLastBaseline = 1 << NSLayoutAttributeLastBaseline, + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV MASAttributeLeftMargin = 1 << NSLayoutAttributeLeftMargin, @@ -60,6 +67,13 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) { @property (nonatomic, strong, readonly) MASConstraint *centerY; @property (nonatomic, strong, readonly) MASConstraint *baseline; +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +@property (nonatomic, strong, readonly) MASConstraint *firstBaseline; +@property (nonatomic, strong, readonly) MASConstraint *lastBaseline; + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV @property (nonatomic, strong, readonly) MASConstraint *leftMargin; diff --git a/Pods/Masonry/Masonry/MASConstraintMaker.m b/Pods/Masonry/Masonry/MASConstraintMaker.m index ecb5297..6e40a26 100644 --- a/Pods/Masonry/Masonry/MASConstraintMaker.m +++ b/Pods/Masonry/Masonry/MASConstraintMaker.m @@ -78,6 +78,9 @@ - (MASConstraint *)addConstraintWithAttributes:(MASAttribute)attrs { __unused MASAttribute anyAttribute = (MASAttributeLeft | MASAttributeRight | MASAttributeTop | MASAttributeBottom | MASAttributeLeading | MASAttributeTrailing | MASAttributeWidth | MASAttributeHeight | MASAttributeCenterX | MASAttributeCenterY | MASAttributeBaseline +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + | MASAttributeFirstBaseline | MASAttributeLastBaseline +#endif #if TARGET_OS_IPHONE || TARGET_OS_TV | MASAttributeLeftMargin | MASAttributeRightMargin | MASAttributeTopMargin | MASAttributeBottomMargin | MASAttributeLeadingMargin | MASAttributeTrailingMargin | MASAttributeCenterXWithinMargins @@ -101,6 +104,13 @@ - (MASConstraint *)addConstraintWithAttributes:(MASAttribute)attrs { if (attrs & MASAttributeCenterY) [attributes addObject:self.view.mas_centerY]; if (attrs & MASAttributeBaseline) [attributes addObject:self.view.mas_baseline]; +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + + if (attrs & MASAttributeFirstBaseline) [attributes addObject:self.view.mas_firstBaseline]; + if (attrs & MASAttributeLastBaseline) [attributes addObject:self.view.mas_lastBaseline]; + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV if (attrs & MASAttributeLeftMargin) [attributes addObject:self.view.mas_leftMargin]; @@ -182,6 +192,19 @@ - (MASConstraint *)baseline { }; } +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +- (MASConstraint *)firstBaseline { + return [self addConstraintWithLayoutAttribute:NSLayoutAttributeFirstBaseline]; +} + +- (MASConstraint *)lastBaseline { + return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline]; +} + +#endif + + #if TARGET_OS_IPHONE || TARGET_OS_TV - (MASConstraint *)leftMargin { diff --git a/Pods/Masonry/Masonry/NSArray+MASAdditions.m b/Pods/Masonry/Masonry/NSArray+MASAdditions.m index da094cb..e01e009 100644 --- a/Pods/Masonry/Masonry/NSArray+MASAdditions.m +++ b/Pods/Masonry/Masonry/NSArray+MASAdditions.m @@ -53,7 +53,7 @@ - (void)mas_distributeViewsAlongAxis:(MASAxisType)axisType withFixedSpacing:(CGF if (prev) { make.width.equalTo(prev); make.left.equalTo(prev.mas_right).offset(fixedSpacing); - if (i == (CGFloat)self.count - 1) {//last one + if (i == self.count - 1) {//last one make.right.equalTo(tempSuperView).offset(-tailSpacing); } } @@ -73,7 +73,7 @@ - (void)mas_distributeViewsAlongAxis:(MASAxisType)axisType withFixedSpacing:(CGF if (prev) { make.height.equalTo(prev); make.top.equalTo(prev.mas_bottom).offset(fixedSpacing); - if (i == (CGFloat)self.count - 1) {//last one + if (i == self.count - 1) {//last one make.bottom.equalTo(tempSuperView).offset(-tailSpacing); } } @@ -102,7 +102,7 @@ - (void)mas_distributeViewsAlongAxis:(MASAxisType)axisType withFixedItemLength:( if (prev) { CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1)); make.width.equalTo(@(fixedItemLength)); - if (i == (CGFloat)self.count - 1) {//last one + if (i == self.count - 1) {//last one make.right.equalTo(tempSuperView).offset(-tailSpacing); } else { @@ -125,7 +125,7 @@ - (void)mas_distributeViewsAlongAxis:(MASAxisType)axisType withFixedItemLength:( if (prev) { CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1)); make.height.equalTo(@(fixedItemLength)); - if (i == (CGFloat)self.count - 1) {//last one + if (i == self.count - 1) {//last one make.bottom.equalTo(tempSuperView).offset(-tailSpacing); } else { diff --git a/Pods/Masonry/Masonry/NSLayoutConstraint+MASDebugAdditions.m b/Pods/Masonry/Masonry/NSLayoutConstraint+MASDebugAdditions.m index 18c93f2..3569cf8 100644 --- a/Pods/Masonry/Masonry/NSLayoutConstraint+MASDebugAdditions.m +++ b/Pods/Masonry/Masonry/NSLayoutConstraint+MASDebugAdditions.m @@ -44,6 +44,11 @@ + (NSDictionary *)layoutAttributeDescriptionsByValue { @(NSLayoutAttributeCenterY) : @"centerY", @(NSLayoutAttributeBaseline) : @"baseline", +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + @(NSLayoutAttributeFirstBaseline) : @"firstBaseline", + @(NSLayoutAttributeLastBaseline) : @"lastBaseline", +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV @(NSLayoutAttributeLeftMargin) : @"leftMargin", @(NSLayoutAttributeRightMargin) : @"rightMargin", diff --git a/Pods/Masonry/Masonry/View+MASAdditions.h b/Pods/Masonry/Masonry/View+MASAdditions.h index 66bd66c..ab1e8ae 100644 --- a/Pods/Masonry/Masonry/View+MASAdditions.h +++ b/Pods/Masonry/Masonry/View+MASAdditions.h @@ -32,6 +32,13 @@ @property (nonatomic, strong, readonly) MASViewAttribute *mas_baseline; @property (nonatomic, strong, readonly) MASViewAttribute *(^mas_attribute)(NSLayoutAttribute attr); +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +@property (nonatomic, strong, readonly) MASViewAttribute *mas_firstBaseline; +@property (nonatomic, strong, readonly) MASViewAttribute *mas_lastBaseline; + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV @property (nonatomic, strong, readonly) MASViewAttribute *mas_leftMargin; diff --git a/Pods/Masonry/Masonry/View+MASAdditions.m b/Pods/Masonry/Masonry/View+MASAdditions.m index e7c4e22..b53b68d 100644 --- a/Pods/Masonry/Masonry/View+MASAdditions.m +++ b/Pods/Masonry/Masonry/View+MASAdditions.m @@ -87,6 +87,17 @@ - (MASViewAttribute *)mas_baseline { }; } +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +- (MASViewAttribute *)mas_firstBaseline { + return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeFirstBaseline]; +} +- (MASViewAttribute *)mas_lastBaseline { + return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLastBaseline]; +} + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV - (MASViewAttribute *)mas_leftMargin { diff --git a/Pods/Masonry/Masonry/View+MASShorthandAdditions.h b/Pods/Masonry/Masonry/View+MASShorthandAdditions.h index fc93c63..0446056 100644 --- a/Pods/Masonry/Masonry/View+MASShorthandAdditions.h +++ b/Pods/Masonry/Masonry/View+MASShorthandAdditions.h @@ -29,6 +29,13 @@ @property (nonatomic, strong, readonly) MASViewAttribute *baseline; @property (nonatomic, strong, readonly) MASViewAttribute *(^attribute)(NSLayoutAttribute attr); +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +@property (nonatomic, strong, readonly) MASViewAttribute *firstBaseline; +@property (nonatomic, strong, readonly) MASViewAttribute *lastBaseline; + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV @property (nonatomic, strong, readonly) MASViewAttribute *leftMargin; @@ -67,6 +74,13 @@ MAS_ATTR_FORWARD(centerX); MAS_ATTR_FORWARD(centerY); MAS_ATTR_FORWARD(baseline); +#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + +MAS_ATTR_FORWARD(firstBaseline); +MAS_ATTR_FORWARD(lastBaseline); + +#endif + #if TARGET_OS_IPHONE || TARGET_OS_TV MAS_ATTR_FORWARD(leftMargin); diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index d7fc491..4df212f 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -10,40 +10,6 @@ 46 objects - 0033391A9614130AC8DCCDB5B263BEC6 - - baseConfigurationReference - 21791204D1FF934F7B069A357FC7C837 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/ReactiveCocoa/ReactiveCocoa-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - 004118365A979D0272F2A680D4D89502 includeInIndex @@ -165,6 +131,74 @@ + 052A17875CB827423D627183396CEB60 + + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + CLANG_WARN_UNREACHABLE_CODE + YES + CLANG_WARN__DUPLICATE_METHOD_MATCH + YES + COPY_PHASE_STRIP + YES + ENABLE_NS_ASSERTIONS + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_PREPROCESSOR_DEFINITIONS + + RELEASE=1 + + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + STRIP_INSTALLED_PRODUCT + NO + SYMROOT + ${SRCROOT}/../build + VALIDATE_PRODUCT + YES + + isa + XCBuildConfiguration + name + Release + 05D1889A0D4361F1F7066E9A387411F3 fileRef @@ -539,40 +573,6 @@ - 0EB5E89BB17510AE9D4971A42147A390 - - baseConfigurationReference - 67C0A188957915FF045740EE02F90538 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/AFNetworking/AFNetworking-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - 0F75DF6C7C5F002280EC53F48E80B587 children @@ -621,40 +621,6 @@ sourceTree <group> - 110147985A59DCAB81DA59E9386F6BC9 - - baseConfigurationReference - 21791204D1FF934F7B069A357FC7C837 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/ReactiveCocoa/ReactiveCocoa-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Debug - 115466118FA87BDEECCAACF743F278ED fileRef @@ -844,7 +810,22 @@ isa PBXBuildFile - 162B149B0DD54501D7C75154E5B604EE + 169E35DD656F3877239FE931E1015534 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + UIImageView+AFNetworking.h + path + UIKit+AFNetworking/UIImageView+AFNetworking.h + sourceTree + <group> + + 17224E02F0E8CE2AC8EF6DDD7B535094 baseConfigurationReference 67C0A188957915FF045740EE02F90538 @@ -855,7 +836,7 @@ GCC_PREFIX_HEADER Target Support Files/AFNetworking/AFNetworking-prefix.pch IPHONEOS_DEPLOYMENT_TARGET - 8.0 + 7.0 MTL_ENABLE_DEBUG_INFO YES OTHER_LDFLAGS @@ -878,21 +859,6 @@ name Debug - 169E35DD656F3877239FE931E1015534 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - UIImageView+AFNetworking.h - path - UIKit+AFNetworking/UIImageView+AFNetworking.h - sourceTree - <group> - 17657A4636EF07802538D947FDC935DB includeInIndex @@ -1037,38 +1003,6 @@ sourceTree <group> - 1D65E37297EC603B9A1EC369A4FC0D6C - - baseConfigurationReference - 98C98CDFB3F20F2925F6CD1F141BB14F - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MACH_O_TYPE - staticlib - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PODS_ROOT - $(SRCROOT) - PRODUCT_NAME - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - 1D92245332BC2DE0FF2BC57AC8B199C6 includeInIndex @@ -1784,6 +1718,40 @@ sourceTree <group> + 2C5CBD3A72085FEB008264874E65D26A + + baseConfigurationReference + 26F32C5D59A247AA20365484F47A9307 + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/JSONModel/JSONModel-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + 2C8ED22F6B291BCE3761ADDC78A8FF78 includeInIndex @@ -1803,8 +1771,8 @@ buildConfigurations - A70CDAD61F90AC503C7D04CC22DA2923 - FB45FFD90572718D82AB9092B750F0CA + B37F0F91F85060E28F1DAAB522DC7EC1 + 052A17875CB827423D627183396CEB60 defaultConfigurationIsVisible 0 @@ -2402,6 +2370,40 @@ sourceTree <group> + 3A2A3C95E1EDF73DEF947480F6B2FCC9 + + baseConfigurationReference + 60BFCACC3B5E009A0D887D734E36EA31 + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/Masonry/Masonry-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + 3AE31E844CA2163E3B381A8E4ACBC3A9 includeInIndex @@ -3107,28 +3109,30 @@ sourceTree <group> - 486119F68E6B6489A0E9A8CD8838B59D + 4801531D66017D8EDD4A34111B741A1B baseConfigurationReference - 4E762F23EC34ED4A6FF3312D84E33A40 + 21791204D1FF934F7B069A357FC7C837 buildSettings ENABLE_STRICT_OBJC_MSGSEND YES + GCC_PREFIX_HEADER + Target Support Files/ReactiveCocoa/ReactiveCocoa-prefix.pch IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MACH_O_TYPE - staticlib + 7.0 MTL_ENABLE_DEBUG_INFO YES OTHER_LDFLAGS OTHER_LIBTOOLFLAGS - PODS_ROOT - $(SRCROOT) + PRIVATE_HEADERS_FOLDER_PATH + PRODUCT_NAME $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + SDKROOT iphoneos SKIP_INSTALL @@ -3835,15 +3839,47 @@ includeInIndex 1 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + NSFileHandle+RACSupport.h + path + ReactiveCocoa/NSFileHandle+RACSupport.h + sourceTree + <group> + + 5D23E2DC305F2752BA9DEC6ED37A7E7F + + baseConfigurationReference + 98C98CDFB3F20F2925F6CD1F141BB14F + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MACH_O_TYPE + staticlib + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PODS_ROOT + $(SRCROOT) + PRODUCT_NAME + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration name - NSFileHandle+RACSupport.h - path - ReactiveCocoa/NSFileHandle+RACSupport.h - sourceTree - <group> + Release 5D52DB6DF2E6C24CECB0015A9177A2E1 @@ -4022,8 +4058,8 @@ buildConfigurations - 486119F68E6B6489A0E9A8CD8838B59D - 1D65E37297EC603B9A1EC369A4FC0D6C + B3B15B14F09EB95E0850FFC502BBADB2 + 5D23E2DC305F2752BA9DEC6ED37A7E7F defaultConfigurationIsVisible 0 @@ -4605,8 +4641,8 @@ buildConfigurations - 162B149B0DD54501D7C75154E5B604EE - 0EB5E89BB17510AE9D4971A42147A390 + 17224E02F0E8CE2AC8EF6DDD7B535094 + CF42542529F689B52406696B5784E1F9 defaultConfigurationIsVisible 0 @@ -4941,6 +4977,40 @@ isa PBXBuildFile + 815239FBF95ACCE77576B3B32E792D4A + + baseConfigurationReference + 21791204D1FF934F7B069A357FC7C837 + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/ReactiveCocoa/ReactiveCocoa-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + 81599471BAB0420D54E1ADF8507A5113 fileRef @@ -5355,8 +5425,8 @@ buildConfigurations - 110147985A59DCAB81DA59E9386F6BC9 - 0033391A9614130AC8DCCDB5B263BEC6 + 4801531D66017D8EDD4A34111B741A1B + 815239FBF95ACCE77576B3B32E792D4A defaultConfigurationIsVisible 0 @@ -5634,40 +5704,6 @@ - 95AE3FB211FA06239C7330FF540873D7 - - baseConfigurationReference - 60BFCACC3B5E009A0D887D734E36EA31 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Masonry/Masonry-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Debug - 95E351BC6A82110E747DD38884E572CB fileRef @@ -6194,79 +6230,6 @@ remoteInfo Masonry - A70CDAD61F90AC503C7D04CC22DA2923 - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - CLANG_WARN_UNREACHABLE_CODE - YES - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - COPY_PHASE_STRIP - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - ONLY_ACTIVE_ARCH - YES - STRIP_INSTALLED_PRODUCT - NO - SYMROOT - ${SRCROOT}/../build - - isa - XCBuildConfiguration - name - Debug - A7ACBAAFCDD7D65CAE6255FF55378EF7 fileRef @@ -6696,6 +6659,79 @@ isa PBXBuildFile + B37F0F91F85060E28F1DAAB522DC7EC1 + + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + CLANG_WARN_UNREACHABLE_CODE + YES + CLANG_WARN__DUPLICATE_METHOD_MATCH + YES + COPY_PHASE_STRIP + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + ONLY_ACTIVE_ARCH + YES + STRIP_INSTALLED_PRODUCT + NO + SYMROOT + ${SRCROOT}/../build + + isa + XCBuildConfiguration + name + Debug + B3847DE982459D44D941465A765806BF fileRef @@ -6703,51 +6739,28 @@ isa PBXBuildFile - B3D1D13E0C6553800746CB8FD61CF946 - - children - - 37DB56D75062CC75FCB0966E1C6E8A8E - 10834806BD7B412BC24F347361FA2C8E - 272643F56613CA0D336AE3DBF19DC404 - 6911BECA35E7518D864239B7E898EEF3 - A1A36D34413696BE466E2CA0AFF194DA - 4E762F23EC34ED4A6FF3312D84E33A40 - 98C98CDFB3F20F2925F6CD1F141BB14F - - isa - PBXGroup - name - Pods - path - Target Support Files/Pods - sourceTree - <group> - - B4331FCCFAF2D870D13E227585F9C260 + B3B15B14F09EB95E0850FFC502BBADB2 baseConfigurationReference - 26F32C5D59A247AA20365484F47A9307 + 4E762F23EC34ED4A6FF3312D84E33A40 buildSettings ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/JSONModel/JSONModel-prefix.pch + YES IPHONEOS_DEPLOYMENT_TARGET - 8.0 + 7.0 + MACH_O_TYPE + staticlib MTL_ENABLE_DEBUG_INFO YES OTHER_LDFLAGS OTHER_LIBTOOLFLAGS - PRIVATE_HEADERS_FOLDER_PATH - + PODS_ROOT + $(SRCROOT) PRODUCT_NAME $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - SDKROOT iphoneos SKIP_INSTALL @@ -6758,6 +6771,27 @@ name Debug + B3D1D13E0C6553800746CB8FD61CF946 + + children + + 37DB56D75062CC75FCB0966E1C6E8A8E + 10834806BD7B412BC24F347361FA2C8E + 272643F56613CA0D336AE3DBF19DC404 + 6911BECA35E7518D864239B7E898EEF3 + A1A36D34413696BE466E2CA0AFF194DA + 4E762F23EC34ED4A6FF3312D84E33A40 + 98C98CDFB3F20F2925F6CD1F141BB14F + + isa + PBXGroup + name + Pods + path + Target Support Files/Pods + sourceTree + <group> + B51AA1F7701DCDBCC9B88A15320F9C2C fileRef @@ -6805,8 +6839,8 @@ buildConfigurations - 95AE3FB211FA06239C7330FF540873D7 - FCB543E03B40FD44221FE9A409AE51EA + EE43A56420D041C473C78C19CD1B0EDB + 3A2A3C95E1EDF73DEF947480F6B2FCC9 defaultConfigurationIsVisible 0 @@ -7259,8 +7293,8 @@ buildConfigurations - B4331FCCFAF2D870D13E227585F9C260 - C9C7912905927EA25CAF2086B7B5BB2F + D5A53314F0406B315CA0867F8EFCFD33 + 2C5CBD3A72085FEB008264874E65D26A defaultConfigurationIsVisible 0 @@ -7396,40 +7430,6 @@ sourceTree <group> - C9C7912905927EA25CAF2086B7B5BB2F - - baseConfigurationReference - 26F32C5D59A247AA20365484F47A9307 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/JSONModel/JSONModel-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - C9E8826ADFEEFD632468E625D9D5218D fileRef @@ -7607,6 +7607,40 @@ sourceTree <group> + CF42542529F689B52406696B5784E1F9 + + baseConfigurationReference + 67C0A188957915FF045740EE02F90538 + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/AFNetworking/AFNetworking-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + D124819C8DFDB013AC2055EC438A22A5 includeInIndex @@ -7867,6 +7901,40 @@ sourceTree <group> + D5A53314F0406B315CA0867F8EFCFD33 + + baseConfigurationReference + 26F32C5D59A247AA20365484F47A9307 + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/JSONModel/JSONModel-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + D618C36CF85F593EF18B2AA4822FEF33 fileRef @@ -8714,6 +8782,40 @@ isa PBXBuildFile + EE43A56420D041C473C78C19CD1B0EDB + + baseConfigurationReference + 60BFCACC3B5E009A0D887D734E36EA31 + buildSettings + + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/Masonry/Masonry-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + EEA84A57D43AB5577A54C9C76B9029AD fileRef @@ -9165,74 +9267,6 @@ sourceTree <group> - FB45FFD90572718D82AB9092B750F0CA - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - CLANG_WARN_UNREACHABLE_CODE - YES - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - COPY_PHASE_STRIP - YES - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_PREPROCESSOR_DEFINITIONS - - RELEASE=1 - - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - STRIP_INSTALLED_PRODUCT - NO - SYMROOT - ${SRCROOT}/../build - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - FC50581968C2D3FAA8C82C7DDD134A98 fileRef @@ -9240,40 +9274,6 @@ isa PBXBuildFile - FCB543E03B40FD44221FE9A409AE51EA - - baseConfigurationReference - 60BFCACC3B5E009A0D887D734E36EA31 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Masonry/Masonry-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - FCDDD3BC67EA205C87238A2A87D5C36C fileRef