Skip to content

Commit ca2e098

Browse files
billinghamjbillinghamj
committed
Xcode 8.0 & macOS 10.12 upgrade
1 parent a9fe1b4 commit ca2e098

File tree

8 files changed

+44
-22
lines changed

8 files changed

+44
-22
lines changed

‎Examples/Examples.xcodeproj/project.pbxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@
928928
1A84BBD31D1BFB0D005234F4 /* Project object */ = {
929929
isa = PBXProject;
930930
attributes = {
931-
LastUpgradeCheck = 0730;
931+
LastUpgradeCheck = 0800;
932932
ORGANIZATIONNAME = JSONModel;
933933
TargetAttributes = {
934934
1A46AB651D1C735C00E10D9D = {
@@ -1782,8 +1782,10 @@
17821782
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
17831783
CLANG_WARN_EMPTY_BODY = YES;
17841784
CLANG_WARN_ENUM_CONVERSION = YES;
1785+
CLANG_WARN_INFINITE_RECURSION = YES;
17851786
CLANG_WARN_INT_CONVERSION = YES;
17861787
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1788+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
17871789
CLANG_WARN_UNREACHABLE_CODE = YES;
17881790
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
17891791
COMBINE_HIDPI_IMAGES = YES;
@@ -1827,8 +1829,10 @@
18271829
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
18281830
CLANG_WARN_EMPTY_BODY = YES;
18291831
CLANG_WARN_ENUM_CONVERSION = YES;
1832+
CLANG_WARN_INFINITE_RECURSION = YES;
18301833
CLANG_WARN_INT_CONVERSION = YES;
18311834
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1835+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
18321836
CLANG_WARN_UNREACHABLE_CODE = YES;
18331837
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
18341838
COMBINE_HIDPI_IMAGES = YES;

‎Examples/Examples.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Examples/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

+10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",

‎Examples/iOS/Base.lproj/LaunchScreen.storyboard

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
5+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
56
</dependencies>
67
<scenes>
78
<!--View Controller-->
@@ -13,10 +14,9 @@
1314
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1415
</layoutGuides>
1516
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
17+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1718
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<animations/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
19+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2020
</view>
2121
</viewController>
2222
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

‎Examples/iOS/Base.lproj/Main.storyboard

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16A201w" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
5+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
56
</dependencies>
67
<scenes>
78
<!--View Controller-->
@@ -13,9 +14,9 @@
1314
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1415
</layoutGuides>
1516
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
16-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
17+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1718
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
19+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1920
</view>
2021
</viewController>
2122
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

‎Examples/macOS/Base.lproj/Main.storyboard

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16A201w" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
66
</dependencies>
77
<scenes>
88
<!--Application-->

‎Examples/tvOS/Base.lproj/Main.storyboard

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="10117" systemVersion="16A201w" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
5+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
56
</dependencies>
67
<scenes>
78
<!--View Controller-->
@@ -15,11 +16,16 @@
1516
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
1617
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
1718
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
19+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
1920
</view>
2021
</viewController>
2122
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
2223
</objects>
2324
</scene>
2425
</scenes>
26+
<simulatedMetricsContainer key="defaultSimulatedMetrics">
27+
<nil key="statusBar"/>
28+
<simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
29+
<simulatedScreenMetrics key="destination"/>
30+
</simulatedMetricsContainer>
2531
</document>

‎Examples/watchOS/Base.lproj/Interface.storyboard

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="6221" systemVersion="13E28" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="AgC-eL-Hgc">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6213"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="3733"/>
4+
<deployment identifier="watchOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="11077"/>
67
</dependencies>
78
<scenes>
89
<!--Interface Controller-->
910
<scene sceneID="aou-V4-d1y">
1011
<objects>
11-
<controller id="AgC-eL-Hgc" customClass="InterfaceController" customModuleProvider=""/>
12+
<controller id="AgC-eL-Hgc" customClass="InterfaceController"/>
1213
</objects>
1314
</scene>
1415
</scenes>

0 commit comments

Comments
 (0)