ios / yh_sdwebimage · Commits

Go to a project

Authored by Olivier Poitrey
Commit f7d0f1d12f7caa000b9acc9a40d02c2b0ab90a3f 1 parent d85d5833

Fix example app

Inline Side-by-side
Showing 2 changed files with 33 additions and 44 deletions
... ... @@ -17,39 +17,33 @@
537612B0155AB74D005750A4 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 537612AF155AB74D005750A4 /* DetailViewController.m */; };
537612B3155AB74D005750A4 /* MasterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B1155AB74D005750A4 /* MasterViewController.xib */; };
537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B4155AB74D005750A4 /* DetailViewController.xib */; };
53980816164349C6003B5191 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5398080416434977003B5191 /* libSDWebImage.a */; };
53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; };
53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; };
53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53EEC18816484553007601E1 /* Default-568h@2x.png */; };
53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53EEC1AD164845D9007601E1 /* libSDWebImage.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
5398080116434977003B5191 /* PBXContainerItemProxy */ = {
53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 53922D6F148C55820056699D;
remoteInfo = SDWebImage;
};
5398080316434977003B5191 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */;
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 53761325155AD0D5005750A4;
remoteInfo = "SDWebImage ARC";
remoteInfo = SDWebImage;
};
5398080516434977003B5191 /* PBXContainerItemProxy */ = {
53EEC1AE164845D9007601E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */;
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 531041E0157EAFA400BBABC3;
remoteInfo = "SDWebImage ARC+MKAnnotation";
remoteInfo = "SDWebImage+MKAnnotation";
};
53980814164349BD003B5191 /* PBXContainerItemProxy */ = {
53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */;
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 53761307155AD0D5005750A4;
remoteInfo = "SDWebImage ARC";
remoteInfo = SDWebImage;
};
/* End PBXContainerItemProxy section */
... ... @@ -71,9 +65,10 @@
537612B5155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController.xib; sourceTree = "<group>"; };
537612E3155ABA3C005750A4 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
537612E6155ABA44005750A4 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
539807FA16434977003B5191 /* SDWebImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDWebImage.xcodeproj; path = ../SDWebImage.xcodeproj; sourceTree = "<group>"; };
53A2B50B155B155A00B12423 /* placeholder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = placeholder.png; sourceTree = "<group>"; };
53A2B50C155B155A00B12423 /* placeholder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placeholder@2x.png"; sourceTree = "<group>"; };
53EEC18816484553007601E1 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../Default-568h@2x.png"; sourceTree = "<group>"; };
53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDWebImage.xcodeproj; path = ../SDWebImage.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
... ... @@ -81,7 +76,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
53980816164349C6003B5191 /* libSDWebImage.a in Frameworks */,
53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */,
531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */,
5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */,
5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */,
... ... @@ -112,7 +107,7 @@
53761298155AB74D005750A4 /* Frameworks */ = {
isa = PBXGroup;
children = (
539807FA16434977003B5191 /* SDWebImage.xcodeproj */,
53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */,
537612E6155ABA44005750A4 /* ImageIO.framework */,
537612E3155ABA3C005750A4 /* MapKit.framework */,
53761299155AB74D005750A4 /* UIKit.framework */,
... ... @@ -141,6 +136,7 @@
537612A0155AB74D005750A4 /* Supporting Files */ = {
isa = PBXGroup;
children = (
53EEC18816484553007601E1 /* Default-568h@2x.png */,
537612A1155AB74D005750A4 /* SDWebImage Demo-Info.plist */,
537612A5155AB74D005750A4 /* main.m */,
537612A7155AB74D005750A4 /* SDWebImage Demo-Prefix.pch */,
... ... @@ -150,12 +146,11 @@
name = "Supporting Files";
sourceTree = "<group>";
};
539807FB16434977003B5191 /* Products */ = {
53EEC1A4164845D8007601E1 /* Products */ = {
isa = PBXGroup;
children = (
5398080216434977003B5191 /* libSDWebImage.a */,
5398080416434977003B5191 /* libSDWebImage.a */,
5398080616434977003B5191 /* libSDWebImageARC+MKAnnotation.a */,
53EEC1AD164845D9007601E1 /* libSDWebImage.a */,
53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */,
);
name = Products;
sourceTree = "<group>";
... ... @@ -174,7 +169,7 @@
buildRules = (
);
dependencies = (
53980815164349BD003B5191 /* PBXTargetDependency */,
53EEC1B1164845E3007601E1 /* PBXTargetDependency */,
);
name = "SDWebImage Demo";
productName = "SDWebImage Demo";
... ... @@ -202,8 +197,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 539807FB16434977003B5191 /* Products */;
ProjectRef = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */;
ProductGroup = 53EEC1A4164845D8007601E1 /* Products */;
ProjectRef = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
},
);
projectRoot = "";
... ... @@ -214,25 +209,18 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
5398080216434977003B5191 /* libSDWebImage.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libSDWebImage.a;
remoteRef = 5398080116434977003B5191 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5398080416434977003B5191 /* libSDWebImage.a */ = {
53EEC1AD164845D9007601E1 /* libSDWebImage.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libSDWebImage.a;
remoteRef = 5398080316434977003B5191 /* PBXContainerItemProxy */;
remoteRef = 53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5398080616434977003B5191 /* libSDWebImageARC+MKAnnotation.a */ = {
53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libSDWebImageARC+MKAnnotation.a";
remoteRef = 5398080516434977003B5191 /* PBXContainerItemProxy */;
path = "libSDWebImage+MKAnnotation.a";
remoteRef = 53EEC1AE164845D9007601E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
... ... @@ -246,6 +234,7 @@
537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */,
53A2B50D155B155A00B12423 /* placeholder.png in Resources */,
53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */,
53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
... ... @@ -266,10 +255,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
53980815164349BD003B5191 /* PBXTargetDependency */ = {
53EEC1B1164845E3007601E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "SDWebImage ARC";
targetProxy = 53980814164349BD003B5191 /* PBXContainerItemProxy */;
name = SDWebImage;
targetProxy = 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
... ... @@ -313,7 +302,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
SDKROOT = iphoneos;
};
name = Debug;
... ... @@ -331,7 +320,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
... ...