From e3ba4110a9ffe09aede3b1e47339ca1315c6f3ce Mon Sep 17 00:00:00 2001 From: Bogdan Poplauschi Date: Sun, 8 May 2016 22:59:32 +0300 Subject: [PATCH] Renamed the schemes for consistency, dynamic frameworks are named SDWebImage instead of WebImage. Updated the Tests Podfile + project. Renamed the WebImage.h to SDWebImage.h to match the framework naming --- SDWebImage.xcodeproj/project.pbxproj | 100 +++++---------- ...Image.xcscheme => SDWebImage iOS.xcscheme} | 14 +-- ...tvOS.xcscheme => SDWebImage tvOS.xcscheme} | 8 +- ...ge.xcscheme => SDWebImage-static.xcscheme} | 2 +- .../xcschemes/SDWebImage Demo.xcscheme | 2 +- .../xcshareddata/xcschemes/Tests.xcscheme | 99 --------------- Tests/Podfile | 12 +- .../project.pbxproj | 114 +++++++++--------- Tests/Tests/Tests-Info.plist | 2 +- WebImage/SDWebImage.h | 37 ++++++ WebImage/WebImage.h | 37 ------ 11 files changed, 141 insertions(+), 286 deletions(-) rename SDWebImage.xcodeproj/xcshareddata/xcschemes/{WebImage.xcscheme => SDWebImage iOS.xcscheme} (88%) rename SDWebImage.xcodeproj/xcshareddata/xcschemes/{WebImage tvOS.xcscheme => SDWebImage tvOS.xcscheme} (94%) rename SDWebImage.xcodeproj/xcshareddata/xcschemes/{SDWebImage.xcscheme => SDWebImage-static.xcscheme} (98%) delete mode 100644 SDWebImage.xcworkspace/xcshareddata/xcschemes/Tests.xcscheme create mode 100644 WebImage/SDWebImage.h delete mode 100644 WebImage/WebImage.h diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index a94cd5b9..49f0d811 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -38,7 +38,7 @@ 00733A701BC4880E00A5A117 /* UIImageView+HighlightedWebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = ABBE71A518C43B4D00B75E91 /* UIImageView+HighlightedWebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 00733A711BC4880E00A5A117 /* UIImageView+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D95148C56230056699D /* UIImageView+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 00733A721BC4880E00A5A117 /* UIView+WebCacheOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = AB615301192DA24600A2D8E9 /* UIView+WebCacheOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 00733A731BC4880E00A5A117 /* WebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* WebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A731BC4880E00A5A117 /* SDWebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* SDWebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 431738781CDFC2580008FEB9 /* alpha.c in Sources */ = {isa = PBXBuildFile; fileRef = DA577D5B1998E6B2007367ED /* alpha.c */; }; 431738791CDFC2580008FEB9 /* alphai.h in Headers */ = {isa = PBXBuildFile; fileRef = DA577D5C1998E6B2007367ED /* alphai.h */; }; 4317387A1CDFC2580008FEB9 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = DA577D5D1998E6B2007367ED /* buffer.c */; }; @@ -271,7 +271,7 @@ 438096731CDFC08F00DC626B /* MKAnnotationView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 535699B515113E7300A4C397 /* MKAnnotationView+WebCache.m */; }; 438096741CDFC09C00DC626B /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 53EDFB911762547C00698166 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; 438096751CDFC0A100DC626B /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 53EDFB921762547C00698166 /* UIImage+WebP.m */; }; - 4A2CAE041AB4BB5400B6BC39 /* WebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* WebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4A2CAE041AB4BB5400B6BC39 /* SDWebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* SDWebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A2CAE181AB4BB6400B6BC39 /* SDWebImageCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D88148C56230056699D /* SDWebImageCompat.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A2CAE191AB4BB6400B6BC39 /* SDWebImageCompat.m in Sources */ = {isa = PBXBuildFile; fileRef = 5340674F167780C40042B59E /* SDWebImageCompat.m */; }; 4A2CAE1A1AB4BB6400B6BC39 /* SDWebImageOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 530E49E71646388E002868E7 /* SDWebImageOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -340,10 +340,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 00733A4C1BC487C000A5A117 /* WebImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A2CADFF1AB4BB5300B6BC39 /* WebImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 00733A4C1BC487C000A5A117 /* SDWebImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4A2CADFF1AB4BB5300B6BC39 /* SDWebImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A2CAE021AB4BB5400B6BC39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4A2CAE031AB4BB5400B6BC39 /* WebImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebImage.h; sourceTree = ""; }; + 4A2CAE031AB4BB5400B6BC39 /* SDWebImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImage.h; sourceTree = ""; }; 530E49E316460AE2002868E7 /* SDWebImageDownloaderOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageDownloaderOperation.h; sourceTree = ""; }; 530E49E416460AE2002868E7 /* SDWebImageDownloaderOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDownloaderOperation.m; sourceTree = ""; }; 530E49E71646388E002868E7 /* SDWebImageOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageOperation.h; sourceTree = ""; }; @@ -490,7 +490,7 @@ 4A2CAE001AB4BB5300B6BC39 /* WebImage */ = { isa = PBXGroup; children = ( - 4A2CAE031AB4BB5400B6BC39 /* WebImage.h */, + 4A2CAE031AB4BB5400B6BC39 /* SDWebImage.h */, 4A2CAE011AB4BB5400B6BC39 /* Supporting Files */, ); path = WebImage; @@ -519,8 +519,8 @@ isa = PBXGroup; children = ( 53761325155AD0D5005750A4 /* libSDWebImage.a */, - 4A2CADFF1AB4BB5300B6BC39 /* WebImage.framework */, - 00733A4C1BC487C000A5A117 /* WebImage.framework */, + 4A2CADFF1AB4BB5300B6BC39 /* SDWebImage.framework */, + 00733A4C1BC487C000A5A117 /* SDWebImage.framework */, ); name = Products; sourceTree = ""; @@ -759,7 +759,7 @@ 431738DF1CDFC8A40008FEB9 /* vp8li.h in Headers */, 4317395B1CDFC8B70008FEB9 /* types.h in Headers */, 431739551CDFC8B70008FEB9 /* decode.h in Headers */, - 00733A731BC4880E00A5A117 /* WebImage.h in Headers */, + 00733A731BC4880E00A5A117 /* SDWebImage.h in Headers */, 00733A701BC4880E00A5A117 /* UIImageView+HighlightedWebCache.h in Headers */, 00733A671BC4880E00A5A117 /* SDImageCache.h in Headers */, 431739191CDFC8AA0008FEB9 /* yuv_tables_sse2.h in Headers */, @@ -799,7 +799,7 @@ 431739541CDFC8B70008FEB9 /* types.h in Headers */, 431738F51CDFC8AA0008FEB9 /* neon.h in Headers */, 431738C51CDFC8A30008FEB9 /* alphai.h in Headers */, - 4A2CAE041AB4BB5400B6BC39 /* WebImage.h in Headers */, + 4A2CAE041AB4BB5400B6BC39 /* SDWebImage.h in Headers */, 431739511CDFC8B70008FEB9 /* format_constants.h in Headers */, 431739231CDFC8B20008FEB9 /* filters.h in Headers */, 4A2CAE211AB4BB7000B6BC39 /* SDWebImageManager.h in Headers */, @@ -904,9 +904,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 00733A4B1BC487C000A5A117 /* WebImage tvOS */ = { + 00733A4B1BC487C000A5A117 /* SDWebImage tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 00733A531BC487C100A5A117 /* Build configuration list for PBXNativeTarget "WebImage tvOS" */; + buildConfigurationList = 00733A531BC487C100A5A117 /* Build configuration list for PBXNativeTarget "SDWebImage tvOS" */; buildPhases = ( 00733A471BC487C000A5A117 /* Sources */, 00733A481BC487C000A5A117 /* Frameworks */, @@ -917,14 +917,14 @@ ); dependencies = ( ); - name = "WebImage tvOS"; + name = "SDWebImage tvOS"; productName = "WebImage tvOS"; - productReference = 00733A4C1BC487C000A5A117 /* WebImage.framework */; + productReference = 00733A4C1BC487C000A5A117 /* SDWebImage.framework */; productType = "com.apple.product-type.framework"; }; - 4A2CADFE1AB4BB5300B6BC39 /* WebImage */ = { + 4A2CADFE1AB4BB5300B6BC39 /* SDWebImage iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 4A2CAE121AB4BB5400B6BC39 /* Build configuration list for PBXNativeTarget "WebImage" */; + buildConfigurationList = 4A2CAE121AB4BB5400B6BC39 /* Build configuration list for PBXNativeTarget "SDWebImage iOS" */; buildPhases = ( 4A2CADFA1AB4BB5300B6BC39 /* Sources */, 4A2CADFB1AB4BB5300B6BC39 /* Frameworks */, @@ -935,9 +935,9 @@ ); dependencies = ( ); - name = WebImage; + name = "SDWebImage iOS"; productName = WebImage; - productReference = 4A2CADFF1AB4BB5300B6BC39 /* WebImage.framework */; + productReference = 4A2CADFF1AB4BB5300B6BC39 /* SDWebImage.framework */; productType = "com.apple.product-type.framework"; }; 53761307155AD0D5005750A4 /* SDWebImage */ = { @@ -988,8 +988,8 @@ projectRoot = ""; targets = ( 53761307155AD0D5005750A4 /* SDWebImage */, - 4A2CADFE1AB4BB5300B6BC39 /* WebImage */, - 00733A4B1BC487C000A5A117 /* WebImage tvOS */, + 4A2CADFE1AB4BB5300B6BC39 /* SDWebImage iOS */, + 00733A4B1BC487C000A5A117 /* SDWebImage tvOS */, ); }; /* End PBXProject section */ @@ -1238,19 +1238,6 @@ 00733A511BC487C100A5A117 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - 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_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; @@ -1259,18 +1246,13 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = WebImage/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = WebImage; - PUBLIC_HEADERS_FOLDER_PATH = WebImage.framework/Headers; + PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier).tvos"; + PRODUCT_NAME = SDWebImage; SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1284,19 +1266,6 @@ 00733A521BC487C100A5A117 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - 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_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1306,18 +1275,13 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = WebImage/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = WebImage; - PUBLIC_HEADERS_FOLDER_PATH = WebImage.framework/Headers; + PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier).tvos"; + PRODUCT_NAME = SDWebImage; SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; @@ -1341,8 +1305,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier).ios"; + PRODUCT_NAME = SDWebImage; }; name = Debug; }; @@ -1360,8 +1324,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = "com.dailymotion.$(PRODUCT_NAME:rfc1034identifier).ios"; + PRODUCT_NAME = SDWebImage; }; name = Release; }; @@ -1416,7 +1380,7 @@ "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; @@ -1471,7 +1435,7 @@ "SD_WEBP=1", "$(inherited)", ); - GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; @@ -1500,7 +1464,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00733A531BC487C100A5A117 /* Build configuration list for PBXNativeTarget "WebImage tvOS" */ = { + 00733A531BC487C100A5A117 /* Build configuration list for PBXNativeTarget "SDWebImage tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 00733A511BC487C100A5A117 /* Debug */, @@ -1509,7 +1473,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4A2CAE121AB4BB5400B6BC39 /* Build configuration list for PBXNativeTarget "WebImage" */ = { + 4A2CAE121AB4BB5400B6BC39 /* Build configuration list for PBXNativeTarget "SDWebImage iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 4A2CAE131AB4BB5400B6BC39 /* Debug */, diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage iOS.xcscheme similarity index 88% rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme rename to SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage iOS.xcscheme index 49dd15a5..9f6c729e 100644 --- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage iOS.xcscheme @@ -1,6 +1,6 @@ @@ -46,8 +46,8 @@ @@ -64,8 +64,8 @@ diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage tvOS.xcscheme similarity index 94% rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme rename to SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage tvOS.xcscheme index 1078bd6f..3efe6430 100644 --- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage tvOS.xcscheme @@ -1,6 +1,6 @@ @@ -47,7 +47,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "00733A4B1BC487C000A5A117" BuildableName = "WebImage.framework" - BlueprintName = "WebImage tvOS" + BlueprintName = "SDWebImage tvOS" ReferencedContainer = "container:SDWebImage.xcodeproj"> @@ -65,7 +65,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "00733A4B1BC487C000A5A117" BuildableName = "WebImage.framework" - BlueprintName = "WebImage tvOS" + BlueprintName = "SDWebImage tvOS" ReferencedContainer = "container:SDWebImage.xcodeproj"> diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage-static.xcscheme similarity index 98% rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme rename to SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage-static.xcscheme index 21350397..46e78df5 100644 --- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage-static.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tests/Podfile b/Tests/Podfile index 7f86b807..f2a66884 100644 --- a/Tests/Podfile +++ b/Tests/Podfile @@ -3,13 +3,9 @@ source 'https://github.com/CocoaPods/Specs.git' xcodeproj 'SDWebImage Tests' workspace '../SDWebImage' -def import_pods - pod 'Expecta', '<=0.3.1' # A Matcher Framework for Objective-C/Cocoa - pod 'SDWebImage', :path => '../' -end - -target :ios do +target 'Tests' do platform :ios, '5.0' - link_with 'Tests' - import_pods + pod 'Expecta', '<=0.3.1' + pod 'SDWebImage', :path => '../' + end diff --git a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj index e1328a2b..ebf9601b 100644 --- a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj +++ b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 0D87E1F83BD319CEC7622E9F /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0462A7F023A057322E59B3C5 /* libPods-Tests.a */; }; 5F7F38AD1AE2A77A00B0E330 /* TestImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5F7F38AC1AE2A77A00B0E330 /* TestImage.jpg */; }; - ABC8501F672447AA91C788DA /* libPods-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB0D107E6B4C4094BA2FEE29 /* libPods-ios.a */; }; DA248D57195472AA00390AB0 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D56195472AA00390AB0 /* XCTest.framework */; }; DA248D59195472AA00390AB0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D58195472AA00390AB0 /* Foundation.framework */; }; DA248D5B195472AA00390AB0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D5A195472AA00390AB0 /* UIKit.framework */; }; @@ -19,9 +19,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1A6DF883515E8008203AB352 /* Pods-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios/Pods-ios.debug.xcconfig"; sourceTree = ""; }; + 0462A7F023A057322E59B3C5 /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 5F7F38AC1AE2A77A00B0E330 /* TestImage.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = TestImage.jpg; sourceTree = ""; }; - CA88E6BDE3581B2BFE933C10 /* Pods-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios/Pods-ios.release.xcconfig"; sourceTree = ""; }; + 700B00151041D7EE118B1ABD /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = ""; }; + A0085854E7D88C98F2F6C9FC /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = ""; }; DA248D53195472AA00390AB0 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; DA248D56195472AA00390AB0 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; DA248D58195472AA00390AB0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; @@ -32,7 +33,6 @@ DA248D68195475D800390AB0 /* SDImageCacheTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageCacheTests.m; sourceTree = ""; }; DA248D6A195476AC00390AB0 /* SDWebImageManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageManagerTests.m; sourceTree = ""; }; DA91BEBB19795BC9006F2536 /* UIImageMultiFormatTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIImageMultiFormatTests.m; sourceTree = ""; }; - EB0D107E6B4C4094BA2FEE29 /* libPods-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -43,18 +43,18 @@ DA248D57195472AA00390AB0 /* XCTest.framework in Frameworks */, DA248D5B195472AA00390AB0 /* UIKit.framework in Frameworks */, DA248D59195472AA00390AB0 /* Foundation.framework in Frameworks */, - ABC8501F672447AA91C788DA /* libPods-ios.a in Frameworks */, + 0D87E1F83BD319CEC7622E9F /* libPods-Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 8D1A343B1A6D91E95D7795EF /* Pods */ = { + 3E8D7663CD326C6F44B23889 /* Pods */ = { isa = PBXGroup; children = ( - 1A6DF883515E8008203AB352 /* Pods-ios.debug.xcconfig */, - CA88E6BDE3581B2BFE933C10 /* Pods-ios.release.xcconfig */, + 700B00151041D7EE118B1ABD /* Pods-Tests.debug.xcconfig */, + A0085854E7D88C98F2F6C9FC /* Pods-Tests.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -65,7 +65,7 @@ DA248D5C195472AA00390AB0 /* Tests */, DA248D55195472AA00390AB0 /* Frameworks */, DA248D54195472AA00390AB0 /* Products */, - 8D1A343B1A6D91E95D7795EF /* Pods */, + 3E8D7663CD326C6F44B23889 /* Pods */, ); sourceTree = ""; }; @@ -83,7 +83,7 @@ DA248D56195472AA00390AB0 /* XCTest.framework */, DA248D58195472AA00390AB0 /* Foundation.framework */, DA248D5A195472AA00390AB0 /* UIKit.framework */, - EB0D107E6B4C4094BA2FEE29 /* libPods-ios.a */, + 0462A7F023A057322E59B3C5 /* libPods-Tests.a */, ); name = Frameworks; sourceTree = ""; @@ -117,12 +117,12 @@ isa = PBXNativeTarget; buildConfigurationList = DA248D67195472AA00390AB0 /* Build configuration list for PBXNativeTarget "Tests" */; buildPhases = ( - FBC8982311CD4ED9A3006D45 /* Check Pods Manifest.lock */, + 09522B7196293172D6408744 /* 📦 Check Pods Manifest.lock */, DA248D4F195472AA00390AB0 /* Sources */, DA248D50195472AA00390AB0 /* Frameworks */, DA248D51195472AA00390AB0 /* Resources */, - D6347736BDF64FC5A4D078A4 /* Copy Pods Resources */, - 4B51E412BA3594400947AC71 /* Embed Pods Frameworks */, + C86216497B5A0BA9501E2C07 /* 📦 Embed Pods Frameworks */, + 85E5D3885A03BFC23B050908 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -139,7 +139,7 @@ DA248D461954721A00390AB0 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0730; }; buildConfigurationList = DA248D491954721A00390AB0 /* Build configuration list for PBXProject "SDWebImage Tests" */; compatibilityVersion = "Xcode 3.2"; @@ -171,44 +171,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 4B51E412BA3594400947AC71 /* Embed Pods Frameworks */ = { + 09522B7196293172D6408744 /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ios/Pods-ios-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - D6347736BDF64FC5A4D078A4 /* Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ios/Pods-ios-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - FBC8982311CD4ED9A3006D45 /* Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Check Pods Manifest.lock"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -216,6 +186,36 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; + 85E5D3885A03BFC23B050908 /* 📦 Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + C86216497B5A0BA9501E2C07 /* 📦 Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -246,18 +246,22 @@ DA248D4A1954721A00390AB0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ENABLE_TESTABILITY = YES; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; DA248D4B1954721A00390AB0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + IPHONEOS_DEPLOYMENT_TARGET = 6.0; }; name = Release; }; DA248D65195472AA00390AB0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1A6DF883515E8008203AB352 /* Pods-ios.debug.xcconfig */; + baseConfigurationReference = 700B00151041D7EE118B1ABD /* Pods-Tests.debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -273,11 +277,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -295,8 +294,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Tests/Tests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.SDWebImage.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; WRAPPER_EXTENSION = xctest; @@ -305,7 +304,7 @@ }; DA248D66195472AA00390AB0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CA88E6BDE3581B2BFE933C10 /* Pods-ios.release.xcconfig */; + baseConfigurationReference = A0085854E7D88C98F2F6C9FC /* Pods-Tests.release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -322,11 +321,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; @@ -337,7 +331,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Tests/Tests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.SDWebImage.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/Tests/Tests/Tests-Info.plist b/Tests/Tests/Tests-Info.plist index 82139999..169b6f71 100644 --- a/Tests/Tests/Tests-Info.plist +++ b/Tests/Tests/Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.SDWebImage.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/WebImage/SDWebImage.h b/WebImage/SDWebImage.h new file mode 100644 index 00000000..b95b911d --- /dev/null +++ b/WebImage/SDWebImage.h @@ -0,0 +1,37 @@ +// +// WebImage.h +// WebImage +// +// Created by Florent Vilmart on 2015-03-14. +// Copyright (c) 2015 Dailymotion. All rights reserved. +// + +#import + +//! Project version number for WebImage. +FOUNDATION_EXPORT double WebImageVersionNumber; + +//! Project version string for WebImage. +FOUNDATION_EXPORT const unsigned char WebImageVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#if !TARGET_OS_TV +#import +#endif +#import +#import +#import +#import diff --git a/WebImage/WebImage.h b/WebImage/WebImage.h deleted file mode 100644 index b832a9a8..00000000 --- a/WebImage/WebImage.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// WebImage.h -// WebImage -// -// Created by Florent Vilmart on 2015-03-14. -// Copyright (c) 2015 Dailymotion. All rights reserved. -// - -#import - -//! Project version number for WebImage. -FOUNDATION_EXPORT double WebImageVersionNumber; - -//! Project version string for WebImage. -FOUNDATION_EXPORT const unsigned char WebImageVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#if !TARGET_OS_TV -#import -#endif -#import -#import -#import -#import