Skip to content

Commit 9cc2cba

Browse files
kharrisonkharrison
committed
TwitterSearch updated for iOS 6 and ARC
+ Removed the SBJson framework as JSON is now supported in foundation + Add launch images and icons + Convert to ARC + Deployment Target moved to iOS 6.0
1 parent 43ef3c5 commit 9cc2cba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+56
-3634
lines changed

‎TwitterSearch/[email protected]‎

5.87 KB
Loading

‎TwitterSearch/Default.png‎

1.81 KB
Loading

‎TwitterSearch/[email protected]‎

5.36 KB
Loading

‎TwitterSearch/Icon-Small.png‎

4.49 KB
Loading

‎TwitterSearch/[email protected]‎

5.47 KB
Loading

‎TwitterSearch/Icon.png‎

5.46 KB
Loading

‎TwitterSearch/[email protected]‎

7.38 KB
Loading

‎TwitterSearch/TwitterSearch.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,11 @@
1818
53CB8117139D70FF0030ADD7 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53CB8115139D70FF0030ADD7 /* RootViewController.xib */; };
1919
53CB812B139D73810030ADD7 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB812A139D73810030ADD7 /* SearchViewController.m */; };
2020
53CB812D139D73C00030ADD7 /* SearchViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53CB812C139D73C00030ADD7 /* SearchViewController.xib */; };
21-
53CB814F139D74B20030ADD7 /* NSObject+SBJson.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB8137139D74B20030ADD7 /* NSObject+SBJson.m */; };
22-
53CB8150139D74B20030ADD7 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB813A139D74B20030ADD7 /* SBJsonParser.m */; };
23-
53CB8151139D74B20030ADD7 /* SBJsonStreamParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB813C139D74B20030ADD7 /* SBJsonStreamParser.m */; };
24-
53CB8152139D74B20030ADD7 /* SBJsonStreamParserAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB813E139D74B20030ADD7 /* SBJsonStreamParserAccumulator.m */; };
25-
53CB8153139D74B20030ADD7 /* SBJsonStreamParserAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB8140139D74B20030ADD7 /* SBJsonStreamParserAdapter.m */; };
26-
53CB8154139D74B20030ADD7 /* SBJsonStreamParserState.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB8142139D74B20030ADD7 /* SBJsonStreamParserState.m */; };
27-
53CB8155139D74B20030ADD7 /* SBJsonStreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB8144139D74B20030ADD7 /* SBJsonStreamWriter.m */; };
28-
53CB8156139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB8146139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.m */; };
29-
53CB8157139D74B20030ADD7 /* SBJsonStreamWriterState.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB8148139D74B20030ADD7 /* SBJsonStreamWriterState.m */; };
30-
53CB8158139D74B20030ADD7 /* SBJsonTokeniser.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB814A139D74B20030ADD7 /* SBJsonTokeniser.m */; };
31-
53CB8159139D74B20030ADD7 /* SBJsonUTF8Stream.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB814C139D74B20030ADD7 /* SBJsonUTF8Stream.m */; };
32-
53CB815A139D74B20030ADD7 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CB814E139D74B20030ADD7 /* SBJsonWriter.m */; };
21+
53D3D83B1763BBA9001E5C7C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 53D3D83A1763BBA9001E5C7C /* [email protected] */; };
22+
53D3D83D1763C22C001E5C7C /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 53D3D83C1763C22C001E5C7C /* Icon.png */; };
23+
53D3D83F1763C232001E5C7C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 53D3D83E1763C232001E5C7C /* [email protected] */; };
24+
53D3D8411763C238001E5C7C /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 53D3D8401763C238001E5C7C /* Default.png */; };
25+
53D3D8431763C23C001E5C7C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 53D3D8421763C23C001E5C7C /* [email protected] */; };
3326
/* End PBXBuildFile section */
3427

3528
/* Begin PBXFileReference section */
@@ -50,32 +43,11 @@
5043
53CB8129139D73800030ADD7 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; };
5144
53CB812A139D73810030ADD7 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
5245
53CB812C139D73C00030ADD7 /* SearchViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchViewController.xib; sourceTree = "<group>"; };
53-
53CB8135139D74B20030ADD7 /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
54-
53CB8136139D74B20030ADD7 /* NSObject+SBJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SBJson.h"; sourceTree = "<group>"; };
55-
53CB8137139D74B20030ADD7 /* NSObject+SBJson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+SBJson.m"; sourceTree = "<group>"; };
56-
53CB8138139D74B20030ADD7 /* SBJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJson.h; sourceTree = "<group>"; };
57-
53CB8139139D74B20030ADD7 /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonParser.h; sourceTree = "<group>"; };
58-
53CB813A139D74B20030ADD7 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = "<group>"; };
59-
53CB813B139D74B20030ADD7 /* SBJsonStreamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamParser.h; sourceTree = "<group>"; };
60-
53CB813C139D74B20030ADD7 /* SBJsonStreamParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamParser.m; sourceTree = "<group>"; };
61-
53CB813D139D74B20030ADD7 /* SBJsonStreamParserAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamParserAccumulator.h; sourceTree = "<group>"; };
62-
53CB813E139D74B20030ADD7 /* SBJsonStreamParserAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamParserAccumulator.m; sourceTree = "<group>"; };
63-
53CB813F139D74B20030ADD7 /* SBJsonStreamParserAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamParserAdapter.h; sourceTree = "<group>"; };
64-
53CB8140139D74B20030ADD7 /* SBJsonStreamParserAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamParserAdapter.m; sourceTree = "<group>"; };
65-
53CB8141139D74B20030ADD7 /* SBJsonStreamParserState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamParserState.h; sourceTree = "<group>"; };
66-
53CB8142139D74B20030ADD7 /* SBJsonStreamParserState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamParserState.m; sourceTree = "<group>"; };
67-
53CB8143139D74B20030ADD7 /* SBJsonStreamWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamWriter.h; sourceTree = "<group>"; };
68-
53CB8144139D74B20030ADD7 /* SBJsonStreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamWriter.m; sourceTree = "<group>"; };
69-
53CB8145139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamWriterAccumulator.h; sourceTree = "<group>"; };
70-
53CB8146139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamWriterAccumulator.m; sourceTree = "<group>"; };
71-
53CB8147139D74B20030ADD7 /* SBJsonStreamWriterState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonStreamWriterState.h; sourceTree = "<group>"; };
72-
53CB8148139D74B20030ADD7 /* SBJsonStreamWriterState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonStreamWriterState.m; sourceTree = "<group>"; };
73-
53CB8149139D74B20030ADD7 /* SBJsonTokeniser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonTokeniser.h; sourceTree = "<group>"; };
74-
53CB814A139D74B20030ADD7 /* SBJsonTokeniser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonTokeniser.m; sourceTree = "<group>"; };
75-
53CB814B139D74B20030ADD7 /* SBJsonUTF8Stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonUTF8Stream.h; sourceTree = "<group>"; };
76-
53CB814C139D74B20030ADD7 /* SBJsonUTF8Stream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonUTF8Stream.m; sourceTree = "<group>"; };
77-
53CB814D139D74B20030ADD7 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = "<group>"; };
78-
53CB814E139D74B20030ADD7 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = "<group>"; };
46+
53D3D83A1763BBA9001E5C7C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
47+
53D3D83C1763C22C001E5C7C /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = ../Icon.png; sourceTree = "<group>"; };
48+
53D3D83E1763C232001E5C7C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
49+
53D3D8401763C238001E5C7C /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../Default.png; sourceTree = "<group>"; };
50+
53D3D8421763C23C001E5C7C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
7951
/* End PBXFileReference section */
8052

8153
/* Begin PBXFrameworksBuildPhase section */
@@ -122,7 +94,6 @@
12294
53CB8103139D70FF0030ADD7 /* TwitterSearch */ = {
12395
isa = PBXGroup;
12496
children = (
125-
53CB8134139D74B20030ADD7 /* JSON */,
12697
53CB810C139D70FF0030ADD7 /* TwitterSearchAppDelegate.h */,
12798
53CB810D139D70FF0030ADD7 /* TwitterSearchAppDelegate.m */,
12899
53CB8112139D70FF0030ADD7 /* RootViewController.h */,
@@ -146,42 +117,14 @@
146117
name = "Supporting Files";
147118
sourceTree = "<group>";
148119
};
149-
53CB8134139D74B20030ADD7 /* JSON */ = {
150-
isa = PBXGroup;
151-
children = (
152-
53CB8135139D74B20030ADD7 /* JSON.h */,
153-
53CB8136139D74B20030ADD7 /* NSObject+SBJson.h */,
154-
53CB8137139D74B20030ADD7 /* NSObject+SBJson.m */,
155-
53CB8138139D74B20030ADD7 /* SBJson.h */,
156-
53CB8139139D74B20030ADD7 /* SBJsonParser.h */,
157-
53CB813A139D74B20030ADD7 /* SBJsonParser.m */,
158-
53CB813B139D74B20030ADD7 /* SBJsonStreamParser.h */,
159-
53CB813C139D74B20030ADD7 /* SBJsonStreamParser.m */,
160-
53CB813D139D74B20030ADD7 /* SBJsonStreamParserAccumulator.h */,
161-
53CB813E139D74B20030ADD7 /* SBJsonStreamParserAccumulator.m */,
162-
53CB813F139D74B20030ADD7 /* SBJsonStreamParserAdapter.h */,
163-
53CB8140139D74B20030ADD7 /* SBJsonStreamParserAdapter.m */,
164-
53CB8141139D74B20030ADD7 /* SBJsonStreamParserState.h */,
165-
53CB8142139D74B20030ADD7 /* SBJsonStreamParserState.m */,
166-
53CB8143139D74B20030ADD7 /* SBJsonStreamWriter.h */,
167-
53CB8144139D74B20030ADD7 /* SBJsonStreamWriter.m */,
168-
53CB8145139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.h */,
169-
53CB8146139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.m */,
170-
53CB8147139D74B20030ADD7 /* SBJsonStreamWriterState.h */,
171-
53CB8148139D74B20030ADD7 /* SBJsonStreamWriterState.m */,
172-
53CB8149139D74B20030ADD7 /* SBJsonTokeniser.h */,
173-
53CB814A139D74B20030ADD7 /* SBJsonTokeniser.m */,
174-
53CB814B139D74B20030ADD7 /* SBJsonUTF8Stream.h */,
175-
53CB814C139D74B20030ADD7 /* SBJsonUTF8Stream.m */,
176-
53CB814D139D74B20030ADD7 /* SBJsonWriter.h */,
177-
53CB814E139D74B20030ADD7 /* SBJsonWriter.m */,
178-
);
179-
path = JSON;
180-
sourceTree = "<group>";
181-
};
182120
53CB815C139D75DB0030ADD7 /* Resources */ = {
183121
isa = PBXGroup;
184122
children = (
123+
53D3D8421763C23C001E5C7C /* [email protected] */,
124+
53D3D8401763C238001E5C7C /* Default.png */,
125+
53D3D83E1763C232001E5C7C /* [email protected] */,
126+
53D3D83C1763C22C001E5C7C /* Icon.png */,
127+
53D3D83A1763BBA9001E5C7C /* [email protected] */,
185128
53CB810F139D70FF0030ADD7 /* MainWindow.xib */,
186129
53CB8115139D70FF0030ADD7 /* RootViewController.xib */,
187130
53CB812C139D73C00030ADD7 /* SearchViewController.xib */,
@@ -243,6 +186,11 @@
243186
53CB8111139D70FF0030ADD7 /* MainWindow.xib in Resources */,
244187
53CB8117139D70FF0030ADD7 /* RootViewController.xib in Resources */,
245188
53CB812D139D73C00030ADD7 /* SearchViewController.xib in Resources */,
189+
53D3D83B1763BBA9001E5C7C /* [email protected] in Resources */,
190+
53D3D83D1763C22C001E5C7C /* Icon.png in Resources */,
191+
53D3D83F1763C232001E5C7C /* [email protected] in Resources */,
192+
53D3D8411763C238001E5C7C /* Default.png in Resources */,
193+
53D3D8431763C23C001E5C7C /* [email protected] in Resources */,
246194
);
247195
runOnlyForDeploymentPostprocessing = 0;
248196
};
@@ -257,18 +205,6 @@
257205
53CB810E139D70FF0030ADD7 /* TwitterSearchAppDelegate.m in Sources */,
258206
53CB8114139D70FF0030ADD7 /* RootViewController.m in Sources */,
259207
53CB812B139D73810030ADD7 /* SearchViewController.m in Sources */,
260-
53CB814F139D74B20030ADD7 /* NSObject+SBJson.m in Sources */,
261-
53CB8150139D74B20030ADD7 /* SBJsonParser.m in Sources */,
262-
53CB8151139D74B20030ADD7 /* SBJsonStreamParser.m in Sources */,
263-
53CB8152139D74B20030ADD7 /* SBJsonStreamParserAccumulator.m in Sources */,
264-
53CB8153139D74B20030ADD7 /* SBJsonStreamParserAdapter.m in Sources */,
265-
53CB8154139D74B20030ADD7 /* SBJsonStreamParserState.m in Sources */,
266-
53CB8155139D74B20030ADD7 /* SBJsonStreamWriter.m in Sources */,
267-
53CB8156139D74B20030ADD7 /* SBJsonStreamWriterAccumulator.m in Sources */,
268-
53CB8157139D74B20030ADD7 /* SBJsonStreamWriterState.m in Sources */,
269-
53CB8158139D74B20030ADD7 /* SBJsonTokeniser.m in Sources */,
270-
53CB8159139D74B20030ADD7 /* SBJsonUTF8Stream.m in Sources */,
271-
53CB815A139D74B20030ADD7 /* SBJsonWriter.m in Sources */,
272208
);
273209
runOnlyForDeploymentPostprocessing = 0;
274210
};
@@ -314,7 +250,7 @@
314250
GCC_VERSION = com.apple.compilers.llvmgcc42;
315251
GCC_WARN_ABOUT_RETURN_TYPE = YES;
316252
GCC_WARN_UNUSED_VARIABLE = YES;
317-
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
253+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
318254
SDKROOT = iphoneos;
319255
};
320256
name = Debug;
@@ -328,7 +264,7 @@
328264
GCC_VERSION = com.apple.compilers.llvmgcc42;
329265
GCC_WARN_ABOUT_RETURN_TYPE = YES;
330266
GCC_WARN_UNUSED_VARIABLE = YES;
331-
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
267+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
332268
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
333269
SDKROOT = iphoneos;
334270
};
@@ -338,12 +274,14 @@
338274
isa = XCBuildConfiguration;
339275
buildSettings = {
340276
ALWAYS_SEARCH_USER_PATHS = NO;
277+
CLANG_ENABLE_OBJC_ARC = YES;
341278
COPY_PHASE_STRIP = NO;
342279
GCC_DYNAMIC_NO_PIC = NO;
343280
GCC_PRECOMPILE_PREFIX_HEADER = YES;
344281
GCC_PREFIX_HEADER = "TwitterSearch/TwitterSearch-Prefix.pch";
345282
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
346283
INFOPLIST_FILE = "TwitterSearch/TwitterSearch-Info.plist";
284+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
347285
PRODUCT_NAME = "$(TARGET_NAME)";
348286
WRAPPER_EXTENSION = app;
349287
};
@@ -353,11 +291,13 @@
353291
isa = XCBuildConfiguration;
354292
buildSettings = {
355293
ALWAYS_SEARCH_USER_PATHS = NO;
294+
CLANG_ENABLE_OBJC_ARC = YES;
356295
COPY_PHASE_STRIP = YES;
357296
GCC_PRECOMPILE_PREFIX_HEADER = YES;
358297
GCC_PREFIX_HEADER = "TwitterSearch/TwitterSearch-Prefix.pch";
359298
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
360299
INFOPLIST_FILE = "TwitterSearch/TwitterSearch-Info.plist";
300+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
361301
PRODUCT_NAME = "$(TARGET_NAME)";
362302
VALIDATE_PRODUCT = YES;
363303
WRAPPER_EXTENSION = app;

‎TwitterSearch/TwitterSearch/JSON/JSON.h‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎TwitterSearch/TwitterSearch/JSON/NSObject+SBJson.h‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)