From 4068b93386b3602dd5a352c2c4cfcb8094326230 Mon Sep 17 00:00:00 2001 From: hoseking Date: Tue, 6 Oct 2015 15:58:23 -0700 Subject: [PATCH 1/2] Add tvOS Framework target --- SDWebImage.xcodeproj/project.pbxproj | 215 ++++++++++++++++++ .../xcschemes/WebImage tvOS.xcscheme | 80 +++++++ WebImage/WebImage.h | 2 + 3 files changed, 297 insertions(+) create mode 100644 SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index 4be5483c5..9e541a12d 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -22,6 +22,38 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 00733A541BC4880000A5A117 /* SDWebImageCompat.m in Sources */ = {isa = PBXBuildFile; fileRef = 5340674F167780C40042B59E /* SDWebImageCompat.m */; }; + 00733A551BC4880000A5A117 /* SDWebImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D8C148C56230056699D /* SDWebImageDownloader.m */; }; + 00733A561BC4880000A5A117 /* SDWebImageDownloaderOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 530E49E416460AE2002868E7 /* SDWebImageDownloaderOperation.m */; }; + 00733A571BC4880000A5A117 /* SDImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D86148C56230056699D /* SDImageCache.m */; }; + 00733A581BC4880000A5A117 /* SDWebImageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D8F148C56230056699D /* SDWebImageManager.m */; }; + 00733A591BC4880000A5A117 /* SDWebImageDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D8A148C56230056699D /* SDWebImageDecoder.m */; }; + 00733A5A1BC4880000A5A117 /* SDWebImagePrefetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D92148C56230056699D /* SDWebImagePrefetcher.m */; }; + 00733A5B1BC4880000A5A117 /* NSData+ImageContentType.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D5B9141188EE8DD006D06BD /* NSData+ImageContentType.m */; }; + 00733A5C1BC4880000A5A117 /* UIButton+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D94148C56230056699D /* UIButton+WebCache.m */; }; + 00733A5D1BC4880000A5A117 /* UIImage+GIF.m in Sources */ = {isa = PBXBuildFile; fileRef = A18A6CC6172DC28500419892 /* UIImage+GIF.m */; }; + 00733A5E1BC4880000A5A117 /* UIImage+MultiFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 53EDFB8917623F7C00698166 /* UIImage+MultiFormat.m */; }; + 00733A5F1BC4880000A5A117 /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 53EDFB921762547C00698166 /* UIImage+WebP.m */; }; + 00733A601BC4880000A5A117 /* UIImageView+HighlightedWebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = ABBE71A618C43B4D00B75E91 /* UIImageView+HighlightedWebCache.m */; }; + 00733A611BC4880000A5A117 /* UIImageView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D96148C56230056699D /* UIImageView+WebCache.m */; }; + 00733A621BC4880000A5A117 /* UIView+WebCacheOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = AB615302192DA24600A2D8E9 /* UIView+WebCacheOperation.m */; }; + 00733A631BC4880E00A5A117 /* SDWebImageCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D88148C56230056699D /* SDWebImageCompat.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A641BC4880E00A5A117 /* SDWebImageOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 530E49E71646388E002868E7 /* SDWebImageOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A651BC4880E00A5A117 /* SDWebImageDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D8B148C56230056699D /* SDWebImageDownloader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A661BC4880E00A5A117 /* SDWebImageDownloaderOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 530E49E316460AE2002868E7 /* SDWebImageDownloaderOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A671BC4880E00A5A117 /* SDImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D85148C56230056699D /* SDImageCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A681BC4880E00A5A117 /* SDWebImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D8E148C56230056699D /* SDWebImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A691BC4880E00A5A117 /* SDWebImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D89148C56230056699D /* SDWebImageDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A6A1BC4880E00A5A117 /* SDWebImagePrefetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D91148C56230056699D /* SDWebImagePrefetcher.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A6B1BC4880E00A5A117 /* NSData+ImageContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D5B9140188EE8DD006D06BD /* NSData+ImageContentType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A6C1BC4880E00A5A117 /* UIButton+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 53922D93148C56230056699D /* UIButton+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A6D1BC4880E00A5A117 /* UIImage+GIF.h in Headers */ = {isa = PBXBuildFile; fileRef = A18A6CC5172DC28500419892 /* UIImage+GIF.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A6E1BC4880E00A5A117 /* UIImage+MultiFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 53EDFB8817623F7C00698166 /* UIImage+MultiFormat.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00733A6F1BC4880E00A5A117 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 53EDFB911762547C00698166 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 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, ); }; }; 4A2CAE041AB4BB5400B6BC39 /* WebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* WebImage.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 */; }; @@ -247,6 +279,7 @@ /* End PBXContainerItemProxy 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; }; 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 = ""; }; @@ -368,6 +401,13 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 00733A481BC487C000A5A117 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4A2CADFB1AB4BB5300B6BC39 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -443,6 +483,7 @@ 531041E0157EAFA400BBABC3 /* libSDWebImage+MKAnnotation.a */, 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */, 4A2CADFF1AB4BB5300B6BC39 /* WebImage.framework */, + 00733A4C1BC487C000A5A117 /* WebImage.framework */, ); name = Products; sourceTree = ""; @@ -657,6 +698,30 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 00733A491BC487C000A5A117 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 00733A6F1BC4880E00A5A117 /* UIImage+WebP.h in Headers */, + 00733A681BC4880E00A5A117 /* SDWebImageManager.h in Headers */, + 00733A6C1BC4880E00A5A117 /* UIButton+WebCache.h in Headers */, + 00733A731BC4880E00A5A117 /* WebImage.h in Headers */, + 00733A701BC4880E00A5A117 /* UIImageView+HighlightedWebCache.h in Headers */, + 00733A671BC4880E00A5A117 /* SDImageCache.h in Headers */, + 00733A711BC4880E00A5A117 /* UIImageView+WebCache.h in Headers */, + 00733A631BC4880E00A5A117 /* SDWebImageCompat.h in Headers */, + 00733A661BC4880E00A5A117 /* SDWebImageDownloaderOperation.h in Headers */, + 00733A721BC4880E00A5A117 /* UIView+WebCacheOperation.h in Headers */, + 00733A6B1BC4880E00A5A117 /* NSData+ImageContentType.h in Headers */, + 00733A6A1BC4880E00A5A117 /* SDWebImagePrefetcher.h in Headers */, + 00733A641BC4880E00A5A117 /* SDWebImageOperation.h in Headers */, + 00733A6E1BC4880E00A5A117 /* UIImage+MultiFormat.h in Headers */, + 00733A6D1BC4880E00A5A117 /* UIImage+GIF.h in Headers */, + 00733A651BC4880E00A5A117 /* SDWebImageDownloader.h in Headers */, + 00733A691BC4880E00A5A117 /* SDWebImageDecoder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4A2CADFC1AB4BB5300B6BC39 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -785,6 +850,24 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 00733A4B1BC487C000A5A117 /* WebImage tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 00733A531BC487C100A5A117 /* Build configuration list for PBXNativeTarget "WebImage tvOS" */; + buildPhases = ( + 00733A471BC487C000A5A117 /* Sources */, + 00733A481BC487C000A5A117 /* Frameworks */, + 00733A491BC487C000A5A117 /* Headers */, + 00733A4A1BC487C000A5A117 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "WebImage tvOS"; + productName = "WebImage tvOS"; + productReference = 00733A4C1BC487C000A5A117 /* WebImage.framework */; + productType = "com.apple.product-type.framework"; + }; 4A2CADFE1AB4BB5300B6BC39 /* WebImage */ = { isa = PBXNativeTarget; buildConfigurationList = 4A2CAE121AB4BB5400B6BC39 /* Build configuration list for PBXNativeTarget "WebImage" */; @@ -865,6 +948,9 @@ LastUpgradeCheck = 0510; ORGANIZATIONNAME = Dailymotion; TargetAttributes = { + 00733A4B1BC487C000A5A117 = { + CreatedOnToolsVersion = 7.1; + }; 4A2CADFE1AB4BB5300B6BC39 = { CreatedOnToolsVersion = 6.3; }; @@ -887,11 +973,19 @@ 531041C2157EAFA400BBABC3 /* SDWebImage+MKAnnotation */, 539F912B16316D2D00160719 /* SDWebImageFramework */, 4A2CADFE1AB4BB5300B6BC39 /* WebImage */, + 00733A4B1BC487C000A5A117 /* WebImage tvOS */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 00733A4A1BC487C000A5A117 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4A2CADFD1AB4BB5300B6BC39 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -947,6 +1041,28 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 00733A471BC487C000A5A117 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 00733A561BC4880000A5A117 /* SDWebImageDownloaderOperation.m in Sources */, + 00733A5A1BC4880000A5A117 /* SDWebImagePrefetcher.m in Sources */, + 00733A5B1BC4880000A5A117 /* NSData+ImageContentType.m in Sources */, + 00733A551BC4880000A5A117 /* SDWebImageDownloader.m in Sources */, + 00733A611BC4880000A5A117 /* UIImageView+WebCache.m in Sources */, + 00733A581BC4880000A5A117 /* SDWebImageManager.m in Sources */, + 00733A541BC4880000A5A117 /* SDWebImageCompat.m in Sources */, + 00733A621BC4880000A5A117 /* UIView+WebCacheOperation.m in Sources */, + 00733A591BC4880000A5A117 /* SDWebImageDecoder.m in Sources */, + 00733A5F1BC4880000A5A117 /* UIImage+WebP.m in Sources */, + 00733A5C1BC4880000A5A117 /* UIButton+WebCache.m in Sources */, + 00733A5D1BC4880000A5A117 /* UIImage+GIF.m in Sources */, + 00733A571BC4880000A5A117 /* SDImageCache.m in Sources */, + 00733A5E1BC4880000A5A117 /* UIImage+MultiFormat.m in Sources */, + 00733A601BC4880000A5A117 /* UIImageView+HighlightedWebCache.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4A2CADFA1AB4BB5300B6BC39 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1092,6 +1208,96 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 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; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + 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_NAME = WebImage; + PUBLIC_HEADERS_FOLDER_PATH = WebImage.framework/Headers; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 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"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + 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_NAME = WebImage; + PUBLIC_HEADERS_FOLDER_PATH = WebImage.framework/Headers; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 4A2CAE131AB4BB5400B6BC39 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1412,6 +1618,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 00733A531BC487C100A5A117 /* Build configuration list for PBXNativeTarget "WebImage tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 00733A511BC487C100A5A117 /* Debug */, + 00733A521BC487C100A5A117 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 4A2CAE121AB4BB5400B6BC39 /* Build configuration list for PBXNativeTarget "WebImage" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme new file mode 100644 index 000000000..1078bd6fb --- /dev/null +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebImage/WebImage.h b/WebImage/WebImage.h index dccc4ec1e..b832a9a86 100644 --- a/WebImage/WebImage.h +++ b/WebImage/WebImage.h @@ -28,7 +28,9 @@ FOUNDATION_EXPORT const unsigned char WebImageVersionString[]; #import #import #import +#if !TARGET_OS_TV #import +#endif #import #import #import From 07fe1f0dfe508ae583014c691952183f4b13054b Mon Sep 17 00:00:00 2001 From: hoseking Date: Tue, 6 Oct 2015 16:14:27 -0700 Subject: [PATCH 2/2] Update project settings for Xcode 7 --- SDWebImage.xcodeproj/project.pbxproj | 7 ++++++- .../xcshareddata/xcschemes/WebImage.xcscheme | 13 ++++++++----- WebImage/Info.plist | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index 9e541a12d..c570bc2c5 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -945,7 +945,7 @@ 53922D66148C55810056699D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0710; ORGANIZATIONNAME = Dailymotion; TargetAttributes = { 00733A4B1BC487C000A5A117 = { @@ -1241,6 +1241,7 @@ 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; SDKROOT = appletvos; @@ -1287,6 +1288,7 @@ 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; SDKROOT = appletvos; @@ -1336,6 +1338,7 @@ 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)"; PUBLIC_HEADERS_FOLDER_PATH = WebImage.framework/Headers; SKIP_INSTALL = YES; @@ -1381,6 +1384,7 @@ 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)"; PUBLIC_HEADERS_FOLDER_PATH = WebImage.framework/Headers; SKIP_INSTALL = YES; @@ -1540,6 +1544,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme index 201217564..49dd15a59 100644 --- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> + + CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.dailymotion.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName