Skip to content

Commit bc06975

Browse files
icanzilbicanzilb
committed
* update demo app to Xcode5
* changed min demo app os ver to 6.0
1 parent 93e81f5 commit bc06975

5 files changed

Lines changed: 192 additions & 1067 deletions

File tree

‎JSONModelDemo_iOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@
783783
9CBBBECF166B6CEF008B4326 /* Project object */ = {
784784
isa = PBXProject;
785785
attributes = {
786-
LastUpgradeCheck = 0450;
786+
LastUpgradeCheck = 0500;
787787
ORGANIZATIONNAME = "Underplot ltd.";
788788
};
789789
buildConfigurationList = 9CBBBED2166B6CEF008B4326 /* Build configuration list for PBXProject "JSONModelDemo_iOS" */;
@@ -1028,6 +1028,7 @@
10281028
GCC_WARN_UNINITIALIZED_AUTOS = YES;
10291029
GCC_WARN_UNUSED_VARIABLE = YES;
10301030
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
1031+
ONLY_ACTIVE_ARCH = YES;
10311032
SDKROOT = iphoneos;
10321033
};
10331034
name = Debug;
@@ -1060,7 +1061,7 @@
10601061
GCC_PRECOMPILE_PREFIX_HEADER = YES;
10611062
GCC_PREFIX_HEADER = "JSONModelDemo_iOS/JSONModelDemo_iOS-Prefix.pch";
10621063
INFOPLIST_FILE = "JSONModelDemo_iOS/JSONModelDemo_iOS-Info.plist";
1063-
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1064+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
10641065
PRODUCT_NAME = JSONModelDemo_iOS;
10651066
WRAPPER_EXTENSION = app;
10661067
};
@@ -1072,7 +1073,7 @@
10721073
GCC_PRECOMPILE_PREFIX_HEADER = YES;
10731074
GCC_PREFIX_HEADER = "JSONModelDemo_iOS/JSONModelDemo_iOS-Prefix.pch";
10741075
INFOPLIST_FILE = "JSONModelDemo_iOS/JSONModelDemo_iOS-Info.plist";
1075-
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1076+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
10761077
PRODUCT_NAME = JSONModelDemo_iOS;
10771078
WRAPPER_EXTENSION = app;
10781079
};

‎JSONModelDemo_iOS/KivaViewController.xib‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
33
<data>
4-
<int key="IBDocument.SystemTarget">1536</int>
5-
<string key="IBDocument.SystemVersion">12C60</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
7-
<string key="IBDocument.AppKitVersion">1187.34</string>
8-
<string key="IBDocument.HIToolboxVersion">625.00</string>
4+
<int key="IBDocument.SystemTarget">1280</int>
5+
<string key="IBDocument.SystemVersion">12E55</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">4504</string>
7+
<string key="IBDocument.AppKitVersion">1187.39</string>
8+
<string key="IBDocument.HIToolboxVersion">626.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
11-
<string key="NS.object.0">1926</string>
11+
<string key="NS.object.0">3734.1</string>
1212
</object>
1313
<array key="IBDocument.IntegratedClassDependencies">
1414
<string>IBNSLayoutConstraint</string>
@@ -61,7 +61,6 @@
6161
<string key="NSFrame">{{0, 20}, {320, 548}}</string>
6262
<reference key="NSSuperview"/>
6363
<reference key="NSWindow"/>
64-
<reference key="NSNextKeyView"/>
6564
<object class="NSColor" key="IBUIBackgroundColor">
6665
<int key="NSColorSpace">3</int>
6766
<bytes key="NSWhite">MQA</bytes>
@@ -84,7 +83,7 @@
8483
</array>
8584
</object>
8685
<string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
87-
<string key="IBUIDisplayName">Retina 4 Full Screen</string>
86+
<string key="IBUIDisplayName">Retina 4-inch Full Screen</string>
8887
<int key="IBUIType">2</int>
8988
</object>
9089
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -150,9 +149,10 @@
150149
</object>
151150
<float key="priority">1000</float>
152151
<reference key="containingView" ref="191373211"/>
153-
<int key="scoringType">8</int>
152+
<int key="scoringType">0</int>
154153
<float key="scoringTypeFloat">29</float>
155154
<int key="contentType">3</int>
155+
<bool key="placeholder">NO</bool>
156156
</object>
157157
<object class="IBNSLayoutConstraint" id="542851877">
158158
<reference key="firstItem" ref="560540434"/>
@@ -166,9 +166,10 @@
166166
</object>
167167
<float key="priority">1000</float>
168168
<reference key="containingView" ref="191373211"/>
169-
<int key="scoringType">8</int>
169+
<int key="scoringType">0</int>
170170
<float key="scoringTypeFloat">29</float>
171171
<int key="contentType">3</int>
172+
<bool key="placeholder">NO</bool>
172173
</object>
173174
<object class="IBNSLayoutConstraint" id="844880186">
174175
<reference key="firstItem" ref="560540434"/>
@@ -182,9 +183,10 @@
182183
</object>
183184
<float key="priority">1000</float>
184185
<reference key="containingView" ref="191373211"/>
185-
<int key="scoringType">8</int>
186+
<int key="scoringType">0</int>
186187
<float key="scoringTypeFloat">29</float>
187188
<int key="contentType">3</int>
189+
<bool key="placeholder">NO</bool>
188190
</object>
189191
<object class="IBNSLayoutConstraint" id="376837870">
190192
<reference key="firstItem" ref="560540434"/>
@@ -198,9 +200,10 @@
198200
</object>
199201
<float key="priority">1000</float>
200202
<reference key="containingView" ref="191373211"/>
201-
<int key="scoringType">8</int>
203+
<int key="scoringType">0</int>
202204
<float key="scoringTypeFloat">29</float>
203205
<int key="contentType">3</int>
206+
<bool key="placeholder">NO</bool>
204207
</object>
205208
</array>
206209
<reference key="parent" ref="0"/>
@@ -301,9 +304,18 @@
301304
</object>
302305
<int key="IBDocument.localizationMode">0</int>
303306
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
307+
<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
308+
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
309+
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
310+
<real value="1280" key="NS.object.0"/>
311+
</object>
312+
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
313+
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
314+
<integer value="4600" key="NS.object.0"/>
315+
</object>
304316
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
305317
<int key="IBDocument.defaultPropertyAccessControl">3</int>
306318
<bool key="IBDocument.UseAutolayout">YES</bool>
307-
<string key="IBCocoaTouchPluginVersion">1926</string>
319+
<string key="IBCocoaTouchPluginVersion">3734.1</string>
308320
</data>
309321
</archive>

0 commit comments

Comments
 (0)