Skip to content

Commit ab07f23

Browse files
author
Olivier Poitrey
committed
Fix SDWebImage#200 crash on archived builds
1 parent ccd3b02 commit ab07f23

File tree

2 files changed

+15
-90
lines changed

2 files changed

+15
-90
lines changed

Examples/SDWebImage Demo.xcodeproj/project.pbxproj

Lines changed: 12 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,11 @@
1717
537612B0155AB74D005750A4 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 537612AF155AB74D005750A4 /* DetailViewController.m */; };
1818
537612B3155AB74D005750A4 /* MasterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B1155AB74D005750A4 /* MasterViewController.xib */; };
1919
537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B4155AB74D005750A4 /* DetailViewController.xib */; };
20-
53A2B4FC155B096D00B12423 /* libSDWebImageARC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53A2B4F9155B095800B12423 /* libSDWebImageARC.a */; };
20+
539D3C6D16323DB900DC792F /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 539D3C6C16323DB900DC792F /* SDWebImage.framework */; };
2121
53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; };
2222
53A2B50E155B155A00B12423 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* [email protected] */; };
2323
/* End PBXBuildFile section */
2424

25-
/* Begin PBXContainerItemProxy section */
26-
5357A29C157ECDB300894652 /* PBXContainerItemProxy */ = {
27-
isa = PBXContainerItemProxy;
28-
containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */;
29-
proxyType = 2;
30-
remoteGlobalIDString = 531041E0157EAFA400BBABC3;
31-
remoteInfo = "SDWebImage ARC+MKAnnotation";
32-
};
33-
53A2B4F6155B095800B12423 /* PBXContainerItemProxy */ = {
34-
isa = PBXContainerItemProxy;
35-
containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */;
36-
proxyType = 2;
37-
remoteGlobalIDString = 53922D6F148C55820056699D;
38-
remoteInfo = SDWebImage;
39-
};
40-
53A2B4F8155B095800B12423 /* PBXContainerItemProxy */ = {
41-
isa = PBXContainerItemProxy;
42-
containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */;
43-
proxyType = 2;
44-
remoteGlobalIDString = 53761325155AD0D5005750A4;
45-
remoteInfo = "SDWebImage ARC";
46-
};
47-
53A2B4FA155B096700B12423 /* PBXContainerItemProxy */ = {
48-
isa = PBXContainerItemProxy;
49-
containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */;
50-
proxyType = 1;
51-
remoteGlobalIDString = 53761307155AD0D5005750A4;
52-
remoteInfo = "SDWebImage ARC";
53-
};
54-
/* End PBXContainerItemProxy section */
55-
5625
/* Begin PBXFileReference section */
5726
53761295155AB74D005750A4 /* SDWebImage Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SDWebImage Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5827
53761299155AB74D005750A4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -69,11 +38,9 @@
6938
537612AF155AB74D005750A4 /* DetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DetailViewController.m; sourceTree = "<group>"; };
7039
537612B2155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MasterViewController.xib; sourceTree = "<group>"; };
7140
537612B5155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController.xib; sourceTree = "<group>"; };
72-
537612CD155AB8F4005750A4 /* libSDWebImage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDWebImage.a; path = "../build/Release-iphoneos/libSDWebImage.a"; sourceTree = "<group>"; };
7341
537612E3155ABA3C005750A4 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
7442
537612E6155ABA44005750A4 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
75-
53761326155AD28E005750A4 /* libSDWebImage ARC.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libSDWebImage ARC.a"; path = "../build/Release-iphoneos/libSDWebImage ARC.a"; sourceTree = "<group>"; };
76-
53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDWebImage.xcodeproj; path = ../SDWebImage.xcodeproj; sourceTree = "<group>"; };
43+
539D3C6C16323DB900DC792F /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDWebImage.framework; sourceTree = "<group>"; };
7744
53A2B50B155B155A00B12423 /* placeholder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = placeholder.png; sourceTree = "<group>"; };
7845
53A2B50C155B155A00B12423 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
7946
/* End PBXFileReference section */
@@ -83,11 +50,11 @@
8350
isa = PBXFrameworksBuildPhase;
8451
buildActionMask = 2147483647;
8552
files = (
86-
53A2B4FC155B096D00B12423 /* libSDWebImageARC.a in Frameworks */,
8753
531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */,
8854
5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */,
8955
5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */,
9056
5376129E155AB74D005750A4 /* CoreGraphics.framework in Frameworks */,
57+
539D3C6D16323DB900DC792F /* SDWebImage.framework in Frameworks */,
9158
);
9259
runOnlyForDeploymentPostprocessing = 0;
9360
};
@@ -97,7 +64,6 @@
9764
5376128A155AB74D005750A4 = {
9865
isa = PBXGroup;
9966
children = (
100-
53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */,
10167
5376129F155AB74D005750A4 /* SDWebImage Demo */,
10268
53761298155AB74D005750A4 /* Frameworks */,
10369
53761296155AB74D005750A4 /* Products */,
@@ -115,10 +81,9 @@
11581
53761298155AB74D005750A4 /* Frameworks */ = {
11682
isa = PBXGroup;
11783
children = (
84+
539D3C6C16323DB900DC792F /* SDWebImage.framework */,
11885
537612E6155ABA44005750A4 /* ImageIO.framework */,
11986
537612E3155ABA3C005750A4 /* MapKit.framework */,
120-
537612CD155AB8F4005750A4 /* libSDWebImage.a */,
121-
53761326155AD28E005750A4 /* libSDWebImage ARC.a */,
12287
53761299155AB74D005750A4 /* UIKit.framework */,
12388
5376129B155AB74D005750A4 /* Foundation.framework */,
12489
5376129D155AB74D005750A4 /* CoreGraphics.framework */,
@@ -154,16 +119,6 @@
154119
name = "Supporting Files";
155120
sourceTree = "<group>";
156121
};
157-
53A2B4EF155B095800B12423 /* Products */ = {
158-
isa = PBXGroup;
159-
children = (
160-
53A2B4F7155B095800B12423 /* libSDWebImage.a */,
161-
53A2B4F9155B095800B12423 /* libSDWebImageARC.a */,
162-
5357A29D157ECDB300894652 /* libSDWebImageARC+MKAnnotation.a */,
163-
);
164-
name = Products;
165-
sourceTree = "<group>";
166-
};
167122
/* End PBXGroup section */
168123

169124
/* Begin PBXNativeTarget section */
@@ -178,7 +133,6 @@
178133
buildRules = (
179134
);
180135
dependencies = (
181-
53A2B4FB155B096700B12423 /* PBXTargetDependency */,
182136
);
183137
name = "SDWebImage Demo";
184138
productName = "SDWebImage Demo";
@@ -204,43 +158,13 @@
204158
mainGroup = 5376128A155AB74D005750A4;
205159
productRefGroup = 53761296155AB74D005750A4 /* Products */;
206160
projectDirPath = "";
207-
projectReferences = (
208-
{
209-
ProductGroup = 53A2B4EF155B095800B12423 /* Products */;
210-
ProjectRef = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */;
211-
},
212-
);
213161
projectRoot = "";
214162
targets = (
215163
53761294155AB74D005750A4 /* SDWebImage Demo */,
216164
);
217165
};
218166
/* End PBXProject section */
219167

220-
/* Begin PBXReferenceProxy section */
221-
5357A29D157ECDB300894652 /* libSDWebImageARC+MKAnnotation.a */ = {
222-
isa = PBXReferenceProxy;
223-
fileType = archive.ar;
224-
path = "libSDWebImageARC+MKAnnotation.a";
225-
remoteRef = 5357A29C157ECDB300894652 /* PBXContainerItemProxy */;
226-
sourceTree = BUILT_PRODUCTS_DIR;
227-
};
228-
53A2B4F7155B095800B12423 /* libSDWebImage.a */ = {
229-
isa = PBXReferenceProxy;
230-
fileType = archive.ar;
231-
path = libSDWebImage.a;
232-
remoteRef = 53A2B4F6155B095800B12423 /* PBXContainerItemProxy */;
233-
sourceTree = BUILT_PRODUCTS_DIR;
234-
};
235-
53A2B4F9155B095800B12423 /* libSDWebImageARC.a */ = {
236-
isa = PBXReferenceProxy;
237-
fileType = archive.ar;
238-
path = libSDWebImageARC.a;
239-
remoteRef = 53A2B4F8155B095800B12423 /* PBXContainerItemProxy */;
240-
sourceTree = BUILT_PRODUCTS_DIR;
241-
};
242-
/* End PBXReferenceProxy section */
243-
244168
/* Begin PBXResourcesBuildPhase section */
245169
53761293155AB74D005750A4 /* Resources */ = {
246170
isa = PBXResourcesBuildPhase;
@@ -269,14 +193,6 @@
269193
};
270194
/* End PBXSourcesBuildPhase section */
271195

272-
/* Begin PBXTargetDependency section */
273-
53A2B4FB155B096700B12423 /* PBXTargetDependency */ = {
274-
isa = PBXTargetDependency;
275-
name = "SDWebImage ARC";
276-
targetProxy = 53A2B4FA155B096700B12423 /* PBXContainerItemProxy */;
277-
};
278-
/* End PBXTargetDependency section */
279-
280196
/* Begin PBXVariantGroup section */
281197
537612B1155AB74D005750A4 /* MasterViewController.xib */ = {
282198
isa = PBXVariantGroup;
@@ -345,6 +261,10 @@
345261
537612BA155AB74D005750A4 /* Debug */ = {
346262
isa = XCBuildConfiguration;
347263
buildSettings = {
264+
FRAMEWORK_SEARCH_PATHS = (
265+
"$(inherited)",
266+
"\"$(SRCROOT)\"",
267+
);
348268
GCC_PRECOMPILE_PREFIX_HEADER = YES;
349269
GCC_PREFIX_HEADER = "SDWebImage Demo/SDWebImage Demo-Prefix.pch";
350270
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
@@ -363,6 +283,10 @@
363283
537612BB155AB74D005750A4 /* Release */ = {
364284
isa = XCBuildConfiguration;
365285
buildSettings = {
286+
FRAMEWORK_SEARCH_PATHS = (
287+
"$(inherited)",
288+
"\"$(SRCROOT)\"",
289+
);
366290
GCC_PRECOMPILE_PREFIX_HEADER = YES;
367291
GCC_PREFIX_HEADER = "SDWebImage Demo/SDWebImage Demo-Prefix.pch";
368292
GCC_PREPROCESSOR_DEFINITIONS = "";

SDWebImage.xcodeproj/project.pbxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@
531531
OTHER_LDFLAGS = "-ObjC";
532532
PRODUCT_NAME = SDWebImage;
533533
SKIP_INSTALL = YES;
534-
STRIP_STYLE = "non-global";
534+
STRIP_STYLE = debugging;
535535
};
536536
name = Debug;
537537
};
@@ -550,7 +550,7 @@
550550
OTHER_LDFLAGS = "-ObjC";
551551
PRODUCT_NAME = SDWebImage;
552552
SKIP_INSTALL = YES;
553-
STRIP_STYLE = "non-global";
553+
STRIP_STYLE = debugging;
554554
};
555555
name = Release;
556556
};
@@ -712,6 +712,7 @@
712712
539F912E16316D2D00160719 /* Release */,
713713
);
714714
defaultConfigurationIsVisible = 0;
715+
defaultConfigurationName = Release;
715716
};
716717
/* End XCConfigurationList section */
717718
};

0 commit comments

Comments
 (0)