Skip to content

Commit 0915c44

Browse files
mokagiomokagio
committed
Updated example project for Xcode 7.1, plus use size classes
1 parent 5ab8dcb commit 0915c44

File tree

5 files changed

+55
-23
lines changed

5 files changed

+55
-23
lines changed

‎Example/Example.xcodeproj/project.pbxproj

+11-3
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
3F5E30B41905662300279D8B /* Project object */ = {
219219
isa = PBXProject;
220220
attributes = {
221-
LastUpgradeCheck = 0510;
221+
LastUpgradeCheck = 0710;
222222
TargetAttributes = {
223223
3F5E30D81905663F00279D8B = {
224224
TestTargetID = 3F5E30BD1905663F00279D8B;
@@ -365,6 +365,7 @@
365365
buildSettings = {
366366
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
367367
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
368+
ENABLE_TESTABILITY = YES;
368369
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
369370
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
370371
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -380,6 +381,8 @@
380381
GCC_WARN_UNUSED_LABEL = YES;
381382
GCC_WARN_UNUSED_VALUE = YES;
382383
GCC_WARN_UNUSED_VARIABLE = YES;
384+
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
385+
ONLY_ACTIVE_ARCH = YES;
383386
RUN_CLANG_STATIC_ANALYZER = YES;
384387
};
385388
name = Debug;
@@ -404,6 +407,7 @@
404407
GCC_WARN_UNUSED_LABEL = YES;
405408
GCC_WARN_UNUSED_VALUE = YES;
406409
GCC_WARN_UNUSED_VARIABLE = YES;
410+
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
407411
RUN_CLANG_STATIC_ANALYZER = YES;
408412
};
409413
name = Release;
@@ -450,8 +454,9 @@
450454
GCC_WARN_UNUSED_FUNCTION = YES;
451455
GCC_WARN_UNUSED_VARIABLE = YES;
452456
INFOPLIST_FILE = "Example/Example-Info.plist";
453-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
457+
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
454458
ONLY_ACTIVE_ARCH = YES;
459+
PRODUCT_BUNDLE_IDENTIFIER = "com.mokagio.ios.${PRODUCT_NAME:rfc1034identifier}";
455460
PRODUCT_NAME = "$(TARGET_NAME)";
456461
SDKROOT = iphoneos;
457462
TARGETED_DEVICE_FAMILY = "1,2";
@@ -495,7 +500,8 @@
495500
GCC_WARN_UNUSED_FUNCTION = YES;
496501
GCC_WARN_UNUSED_VARIABLE = YES;
497502
INFOPLIST_FILE = "Example/Example-Info.plist";
498-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
503+
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
504+
PRODUCT_BUNDLE_IDENTIFIER = "com.mokagio.ios.${PRODUCT_NAME:rfc1034identifier}";
499505
PRODUCT_NAME = "$(TARGET_NAME)";
500506
SDKROOT = iphoneos;
501507
TARGETED_DEVICE_FAMILY = "1,2";
@@ -546,6 +552,7 @@
546552
INFOPLIST_FILE = "ExampleTests/ExampleTests-Info.plist";
547553
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
548554
ONLY_ACTIVE_ARCH = YES;
555+
PRODUCT_BUNDLE_IDENTIFIER = "com.mokagio.ios.${PRODUCT_NAME:rfc1034identifier}";
549556
PRODUCT_NAME = "$(TARGET_NAME)";
550557
SDKROOT = iphoneos;
551558
TEST_HOST = "$(BUNDLE_LOADER)";
@@ -588,6 +595,7 @@
588595
GCC_WARN_UNUSED_VARIABLE = YES;
589596
INFOPLIST_FILE = "ExampleTests/ExampleTests-Info.plist";
590597
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
598+
PRODUCT_BUNDLE_IDENTIFIER = "com.mokagio.ios.${PRODUCT_NAME:rfc1034identifier}";
591599
PRODUCT_NAME = "$(TARGET_NAME)";
592600
SDKROOT = iphoneos;
593601
TEST_HOST = "$(BUNDLE_LOADER)";

‎Example/Example/Example-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.mokagio.ios.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Example/Example/ExampleViewController~iphone.xib

+25-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
56
</dependencies>
67
<objects>
78
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ExampleViewController">
@@ -13,24 +14,35 @@
1314
</placeholder>
1415
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
1516
<view contentMode="scaleToFill" id="iN0-l3-epB">
16-
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
17+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
1718
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1819
<subviews>
19-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Left Aligned UICollectionView Layout" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="s7c-TM-Fdt">
20-
<rect key="frame" x="20" y="0.0" width="280" height="107"/>
21-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22-
<fontDescription key="fontDescription" type="system" pointSize="25"/>
23-
<nil key="highlightedColor"/>
24-
</label>
25-
<collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="1dx-Ff-Vxw">
26-
<rect key="frame" x="20" y="115" width="280" height="453"/>
27-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20+
<collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="1dx-Ff-Vxw">
21+
<rect key="frame" x="8" y="115" width="584" height="485"/>
2822
<collectionViewLayout key="collectionViewLayout" id="7bk-Y3-Kqi" customClass="UICollectionViewLeftAlignedLayout"/>
2923
<cells/>
3024
</collectionView>
25+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Left Aligned UICollectionView Layout" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="s7c-TM-Fdt">
26+
<rect key="frame" x="8" y="8" width="584" height="107"/>
27+
<constraints>
28+
<constraint firstAttribute="height" constant="107" id="fVn-fc-gQH"/>
29+
</constraints>
30+
<fontDescription key="fontDescription" type="system" pointSize="25"/>
31+
<nil key="highlightedColor"/>
32+
</label>
3133
</subviews>
3234
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
33-
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
35+
<constraints>
36+
<constraint firstAttribute="bottom" secondItem="1dx-Ff-Vxw" secondAttribute="bottom" id="3ip-di-VZx"/>
37+
<constraint firstItem="1dx-Ff-Vxw" firstAttribute="top" secondItem="s7c-TM-Fdt" secondAttribute="bottom" id="4Cw-1m-WYK"/>
38+
<constraint firstItem="s7c-TM-Fdt" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="ZlM-mW-Xwz"/>
39+
<constraint firstAttribute="trailing" secondItem="s7c-TM-Fdt" secondAttribute="trailing" constant="8" id="aKd-eX-6vH"/>
40+
<constraint firstAttribute="trailing" secondItem="1dx-Ff-Vxw" secondAttribute="trailing" constant="8" id="gSS-P8-gSx"/>
41+
<constraint firstItem="1dx-Ff-Vxw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="hrW-2B-ljc"/>
42+
<constraint firstItem="s7c-TM-Fdt" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="8" id="pJj-Ny-iEs"/>
43+
</constraints>
44+
<nil key="simulatedStatusBarMetrics"/>
45+
<point key="canvasLocation" x="305" y="377"/>
3446
</view>
3547
</objects>
3648
</document>

‎Example/ExampleTests/ExampleTests-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.mokagio.ios.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

‎Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-Example-UICollectionViewLeftAlignedLayout.xcscheme

+17-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)