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 @@ @@ -17,39 +17,33 @@
17 537612B0155AB74D005750A4 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 537612AF155AB74D005750A4 /* DetailViewController.m */; }; 17 537612B0155AB74D005750A4 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 537612AF155AB74D005750A4 /* DetailViewController.m */; };
18 537612B3155AB74D005750A4 /* MasterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B1155AB74D005750A4 /* MasterViewController.xib */; }; 18 537612B3155AB74D005750A4 /* MasterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B1155AB74D005750A4 /* MasterViewController.xib */; };
19 537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B4155AB74D005750A4 /* DetailViewController.xib */; }; 19 537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B4155AB74D005750A4 /* DetailViewController.xib */; };
20 - 53980816164349C6003B5191 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5398080416434977003B5191 /* libSDWebImage.a */; };  
21 53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; }; 20 53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; };
22 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; }; 21 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; };
  22 + 53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53EEC18816484553007601E1 /* Default-568h@2x.png */; };
  23 + 53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53EEC1AD164845D9007601E1 /* libSDWebImage.a */; };
23 /* End PBXBuildFile section */ 24 /* End PBXBuildFile section */
24 25
25 /* Begin PBXContainerItemProxy section */ 26 /* Begin PBXContainerItemProxy section */
26 - 5398080116434977003B5191 /* PBXContainerItemProxy */ = { 27 + 53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */ = {
27 isa = PBXContainerItemProxy; 28 isa = PBXContainerItemProxy;
28 - containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */;  
29 - proxyType = 2;  
30 - remoteGlobalIDString = 53922D6F148C55820056699D;  
31 - remoteInfo = SDWebImage;  
32 - };  
33 - 5398080316434977003B5191 /* PBXContainerItemProxy */ = {  
34 - isa = PBXContainerItemProxy;  
35 - containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */; 29 + containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
36 proxyType = 2; 30 proxyType = 2;
37 remoteGlobalIDString = 53761325155AD0D5005750A4; 31 remoteGlobalIDString = 53761325155AD0D5005750A4;
38 - remoteInfo = "SDWebImage ARC"; 32 + remoteInfo = SDWebImage;
39 }; 33 };
40 - 5398080516434977003B5191 /* PBXContainerItemProxy */ = { 34 + 53EEC1AE164845D9007601E1 /* PBXContainerItemProxy */ = {
41 isa = PBXContainerItemProxy; 35 isa = PBXContainerItemProxy;
42 - containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */; 36 + containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
43 proxyType = 2; 37 proxyType = 2;
44 remoteGlobalIDString = 531041E0157EAFA400BBABC3; 38 remoteGlobalIDString = 531041E0157EAFA400BBABC3;
45 - remoteInfo = "SDWebImage ARC+MKAnnotation"; 39 + remoteInfo = "SDWebImage+MKAnnotation";
46 }; 40 };
47 - 53980814164349BD003B5191 /* PBXContainerItemProxy */ = { 41 + 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */ = {
48 isa = PBXContainerItemProxy; 42 isa = PBXContainerItemProxy;
49 - containerPortal = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */; 43 + containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
50 proxyType = 1; 44 proxyType = 1;
51 remoteGlobalIDString = 53761307155AD0D5005750A4; 45 remoteGlobalIDString = 53761307155AD0D5005750A4;
52 - remoteInfo = "SDWebImage ARC"; 46 + remoteInfo = SDWebImage;
53 }; 47 };
54 /* End PBXContainerItemProxy section */ 48 /* End PBXContainerItemProxy section */
55 49
@@ -71,9 +65,10 @@ @@ -71,9 +65,10 @@
71 537612B5155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController.xib; sourceTree = "<group>"; }; 65 537612B5155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController.xib; sourceTree = "<group>"; };
72 537612E3155ABA3C005750A4 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; 66 537612E3155ABA3C005750A4 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
73 537612E6155ABA44005750A4 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; 67 537612E6155ABA44005750A4 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
74 - 539807FA16434977003B5191 /* SDWebImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDWebImage.xcodeproj; path = ../SDWebImage.xcodeproj; sourceTree = "<group>"; };  
75 53A2B50B155B155A00B12423 /* placeholder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = placeholder.png; sourceTree = "<group>"; }; 68 53A2B50B155B155A00B12423 /* placeholder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = placeholder.png; sourceTree = "<group>"; };
76 53A2B50C155B155A00B12423 /* placeholder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placeholder@2x.png"; sourceTree = "<group>"; }; 69 53A2B50C155B155A00B12423 /* placeholder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placeholder@2x.png"; sourceTree = "<group>"; };
  70 + 53EEC18816484553007601E1 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../Default-568h@2x.png"; sourceTree = "<group>"; };
  71 + 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDWebImage.xcodeproj; path = ../SDWebImage.xcodeproj; sourceTree = "<group>"; };
77 /* End PBXFileReference section */ 72 /* End PBXFileReference section */
78 73
79 /* Begin PBXFrameworksBuildPhase section */ 74 /* Begin PBXFrameworksBuildPhase section */
@@ -81,7 +76,7 @@ @@ -81,7 +76,7 @@
81 isa = PBXFrameworksBuildPhase; 76 isa = PBXFrameworksBuildPhase;
82 buildActionMask = 2147483647; 77 buildActionMask = 2147483647;
83 files = ( 78 files = (
84 - 53980816164349C6003B5191 /* libSDWebImage.a in Frameworks */, 79 + 53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */,
85 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */, 80 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */,
86 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */, 81 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */,
87 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */, 82 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */,
@@ -112,7 +107,7 @@ @@ -112,7 +107,7 @@
112 53761298155AB74D005750A4 /* Frameworks */ = { 107 53761298155AB74D005750A4 /* Frameworks */ = {
113 isa = PBXGroup; 108 isa = PBXGroup;
114 children = ( 109 children = (
115 - 539807FA16434977003B5191 /* SDWebImage.xcodeproj */, 110 + 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */,
116 537612E6155ABA44005750A4 /* ImageIO.framework */, 111 537612E6155ABA44005750A4 /* ImageIO.framework */,
117 537612E3155ABA3C005750A4 /* MapKit.framework */, 112 537612E3155ABA3C005750A4 /* MapKit.framework */,
118 53761299155AB74D005750A4 /* UIKit.framework */, 113 53761299155AB74D005750A4 /* UIKit.framework */,
@@ -141,6 +136,7 @@ @@ -141,6 +136,7 @@
141 537612A0155AB74D005750A4 /* Supporting Files */ = { 136 537612A0155AB74D005750A4 /* Supporting Files */ = {
142 isa = PBXGroup; 137 isa = PBXGroup;
143 children = ( 138 children = (
  139 + 53EEC18816484553007601E1 /* Default-568h@2x.png */,
144 537612A1155AB74D005750A4 /* SDWebImage Demo-Info.plist */, 140 537612A1155AB74D005750A4 /* SDWebImage Demo-Info.plist */,
145 537612A5155AB74D005750A4 /* main.m */, 141 537612A5155AB74D005750A4 /* main.m */,
146 537612A7155AB74D005750A4 /* SDWebImage Demo-Prefix.pch */, 142 537612A7155AB74D005750A4 /* SDWebImage Demo-Prefix.pch */,
@@ -150,12 +146,11 @@ @@ -150,12 +146,11 @@
150 name = "Supporting Files"; 146 name = "Supporting Files";
151 sourceTree = "<group>"; 147 sourceTree = "<group>";
152 }; 148 };
153 - 539807FB16434977003B5191 /* Products */ = { 149 + 53EEC1A4164845D8007601E1 /* Products */ = {
154 isa = PBXGroup; 150 isa = PBXGroup;
155 children = ( 151 children = (
156 - 5398080216434977003B5191 /* libSDWebImage.a */,  
157 - 5398080416434977003B5191 /* libSDWebImage.a */,  
158 - 5398080616434977003B5191 /* libSDWebImageARC+MKAnnotation.a */, 152 + 53EEC1AD164845D9007601E1 /* libSDWebImage.a */,
  153 + 53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */,
159 ); 154 );
160 name = Products; 155 name = Products;
161 sourceTree = "<group>"; 156 sourceTree = "<group>";
@@ -174,7 +169,7 @@ @@ -174,7 +169,7 @@
174 buildRules = ( 169 buildRules = (
175 ); 170 );
176 dependencies = ( 171 dependencies = (
177 - 53980815164349BD003B5191 /* PBXTargetDependency */, 172 + 53EEC1B1164845E3007601E1 /* PBXTargetDependency */,
178 ); 173 );
179 name = "SDWebImage Demo"; 174 name = "SDWebImage Demo";
180 productName = "SDWebImage Demo"; 175 productName = "SDWebImage Demo";
@@ -202,8 +197,8 @@ @@ -202,8 +197,8 @@
202 projectDirPath = ""; 197 projectDirPath = "";
203 projectReferences = ( 198 projectReferences = (
204 { 199 {
205 - ProductGroup = 539807FB16434977003B5191 /* Products */;  
206 - ProjectRef = 539807FA16434977003B5191 /* SDWebImage.xcodeproj */; 200 + ProductGroup = 53EEC1A4164845D8007601E1 /* Products */;
  201 + ProjectRef = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
207 }, 202 },
208 ); 203 );
209 projectRoot = ""; 204 projectRoot = "";
@@ -214,25 +209,18 @@ @@ -214,25 +209,18 @@
214 /* End PBXProject section */ 209 /* End PBXProject section */
215 210
216 /* Begin PBXReferenceProxy section */ 211 /* Begin PBXReferenceProxy section */
217 - 5398080216434977003B5191 /* libSDWebImage.a */ = {  
218 - isa = PBXReferenceProxy;  
219 - fileType = archive.ar;  
220 - path = libSDWebImage.a;  
221 - remoteRef = 5398080116434977003B5191 /* PBXContainerItemProxy */;  
222 - sourceTree = BUILT_PRODUCTS_DIR;  
223 - };  
224 - 5398080416434977003B5191 /* libSDWebImage.a */ = { 212 + 53EEC1AD164845D9007601E1 /* libSDWebImage.a */ = {
225 isa = PBXReferenceProxy; 213 isa = PBXReferenceProxy;
226 fileType = archive.ar; 214 fileType = archive.ar;
227 path = libSDWebImage.a; 215 path = libSDWebImage.a;
228 - remoteRef = 5398080316434977003B5191 /* PBXContainerItemProxy */; 216 + remoteRef = 53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */;
229 sourceTree = BUILT_PRODUCTS_DIR; 217 sourceTree = BUILT_PRODUCTS_DIR;
230 }; 218 };
231 - 5398080616434977003B5191 /* libSDWebImageARC+MKAnnotation.a */ = { 219 + 53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */ = {
232 isa = PBXReferenceProxy; 220 isa = PBXReferenceProxy;
233 fileType = archive.ar; 221 fileType = archive.ar;
234 - path = "libSDWebImageARC+MKAnnotation.a";  
235 - remoteRef = 5398080516434977003B5191 /* PBXContainerItemProxy */; 222 + path = "libSDWebImage+MKAnnotation.a";
  223 + remoteRef = 53EEC1AE164845D9007601E1 /* PBXContainerItemProxy */;
236 sourceTree = BUILT_PRODUCTS_DIR; 224 sourceTree = BUILT_PRODUCTS_DIR;
237 }; 225 };
238 /* End PBXReferenceProxy section */ 226 /* End PBXReferenceProxy section */
@@ -246,6 +234,7 @@ @@ -246,6 +234,7 @@
246 537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */, 234 537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */,
247 53A2B50D155B155A00B12423 /* placeholder.png in Resources */, 235 53A2B50D155B155A00B12423 /* placeholder.png in Resources */,
248 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */, 236 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */,
  237 + 53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */,
249 ); 238 );
250 runOnlyForDeploymentPostprocessing = 0; 239 runOnlyForDeploymentPostprocessing = 0;
251 }; 240 };
@@ -266,10 +255,10 @@ @@ -266,10 +255,10 @@
266 /* End PBXSourcesBuildPhase section */ 255 /* End PBXSourcesBuildPhase section */
267 256
268 /* Begin PBXTargetDependency section */ 257 /* Begin PBXTargetDependency section */
269 - 53980815164349BD003B5191 /* PBXTargetDependency */ = { 258 + 53EEC1B1164845E3007601E1 /* PBXTargetDependency */ = {
270 isa = PBXTargetDependency; 259 isa = PBXTargetDependency;
271 - name = "SDWebImage ARC";  
272 - targetProxy = 53980814164349BD003B5191 /* PBXContainerItemProxy */; 260 + name = SDWebImage;
  261 + targetProxy = 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */;
273 }; 262 };
274 /* End PBXTargetDependency section */ 263 /* End PBXTargetDependency section */
275 264
@@ -313,7 +302,7 @@ @@ -313,7 +302,7 @@
313 GCC_WARN_ABOUT_RETURN_TYPE = YES; 302 GCC_WARN_ABOUT_RETURN_TYPE = YES;
314 GCC_WARN_UNINITIALIZED_AUTOS = YES; 303 GCC_WARN_UNINITIALIZED_AUTOS = YES;
315 GCC_WARN_UNUSED_VARIABLE = YES; 304 GCC_WARN_UNUSED_VARIABLE = YES;
316 - IPHONEOS_DEPLOYMENT_TARGET = 4.0; 305 + IPHONEOS_DEPLOYMENT_TARGET = 5.0;
317 SDKROOT = iphoneos; 306 SDKROOT = iphoneos;
318 }; 307 };
319 name = Debug; 308 name = Debug;
@@ -331,7 +320,7 @@ @@ -331,7 +320,7 @@
331 GCC_WARN_ABOUT_RETURN_TYPE = YES; 320 GCC_WARN_ABOUT_RETURN_TYPE = YES;
332 GCC_WARN_UNINITIALIZED_AUTOS = YES; 321 GCC_WARN_UNINITIALIZED_AUTOS = YES;
333 GCC_WARN_UNUSED_VARIABLE = YES; 322 GCC_WARN_UNUSED_VARIABLE = YES;
334 - IPHONEOS_DEPLOYMENT_TARGET = 4.0; 323 + IPHONEOS_DEPLOYMENT_TARGET = 5.0;
335 OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; 324 OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
336 SDKROOT = iphoneos; 325 SDKROOT = iphoneos;
337 VALIDATE_PRODUCT = YES; 326 VALIDATE_PRODUCT = YES;