finished adapting examples for Swift 2.2 / Swift 3 upcoming changes

mattneub · mattneub · commit a1501cdab330 · 2016-02-12T18:01:44.000-08:00
diff --git a/bk2ch16p687AVQueuePlayer/ch29p952AVQueuePlayer/ViewController.swift b/bk2ch16p687AVQueuePlayer/ch29p952AVQueuePlayer/ViewController.swift
@@ -170,7 +170,7 @@ class ViewController: UIViewController {
     
     func changed() {
         guard let item = self.qp.currentItem else {return}
-        self.curnum++
+        self.curnum += 1
         var arr = item.asset.commonMetadata
         arr = AVMetadataItem.metadataItemsFromArray(arr,
             withKey:AVMetadataCommonKeyTitle,
diff --git a/bk2ch18p713addressBook/ch31p973addressBook.xcodeproj/project.pbxproj b/bk2ch18p713addressBook/ch31p973addressBook.xcodeproj/project.pbxproj
@@ -8,8 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		324DD41E19A4F82500E85278 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 324DD41D19A4F82500E85278 /* ViewController.swift */; };
-		32B1342E1BB9823500B0BD94 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32B1342D1BB9823500B0BD94 /* LaunchScreen.storyboard */; settings = {ASSET_TAGS = (); }; };
-		32B134301BB9824500B0BD94 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B1342F1BB9824500B0BD94 /* AppDelegate.swift */; settings = {ASSET_TAGS = (); }; };
+		32B1342E1BB9823500B0BD94 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32B1342D1BB9823500B0BD94 /* LaunchScreen.storyboard */; };
+		32B134301BB9824500B0BD94 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B1342F1BB9824500B0BD94 /* AppDelegate.swift */; };
 		C9D7D14518293B1800476387 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C9D7D14318293B1800476387 /* Main.storyboard */; };
 		C9D7D14A18293B1800476387 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9D7D14918293B1800476387 /* Assets.xcassets */; };
 /* End PBXBuildFile section */
@@ -230,6 +230,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ch31p973addressBook/ch31p973addressBook-Prefix.pch";
 				INFOPLIST_FILE = "ch31p973addressBook/ch31p973addressBook-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -248,6 +249,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ch31p973addressBook/ch31p973addressBook-Prefix.pch";
 				INFOPLIST_FILE = "ch31p973addressBook/ch31p973addressBook-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/bk2ch18p713addressBookNew/ch31p973addressBook/ViewController.swift b/bk2ch18p713addressBookNew/ch31p973addressBook/ViewController.swift
@@ -70,7 +70,7 @@ class ViewController : UIViewController, CNContactPickerDelegate, CNContactViewC
                         CNContactFamilyNameKey, CNContactGivenNameKey
                         ])
                     matts = matts.filter{$0.familyName == "Neuburg"}
-                    guard var moi = matts.first else {
+                    guard let moi = matts.first else {
                         print("couldn't find myself")
                         return
                     }
@@ -89,7 +89,7 @@ class ViewController : UIViewController, CNContactPickerDelegate, CNContactViewC
                             stop.memory = true
                         }
                     }
-                    guard var moi = matt else {
+                    guard let moi = matt else {
                         print("couldn't find myself")
                         return
                     }
diff --git a/bk2ch24p842downloader/ch37p1099downloader/MyTableViewController.swift b/bk2ch24p842downloader/ch37p1099downloader/MyTableViewController.swift
@@ -61,7 +61,7 @@ class MyTableViewController: UITableViewController {
                 cell.imageView!.image = nil
                 m.task = self.downloader.download(m.picurl) { // *
                     [weak self] url in // *
-                    m.task == nil // *
+                    m.task = nil // *
                     if url == nil {
                         return
                     }
diff --git a/bk2ch26p878undoableDrag2/ch39p1123undoableDrag/Base.lproj/Main.storyboard b/bk2ch26p878undoableDrag2/ch39p1123undoableDrag/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10109" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10083"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
diff --git a/bk2ch26p878undoableDrag4/ch39p1123undoableDrag/Base.lproj/Main.storyboard b/bk2ch26p878undoableDrag4/ch39p1123undoableDrag/Base.lproj/Main.storyboard
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10109" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10083"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="ufC-wZ-h7g">
             <objects>
-                <viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="ch39p1123undoableDrag3" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="ch39p1123undoableDrag4" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="LKo-1q-b1Y"/>
                         <viewControllerLayoutGuide type="bottom" id="LJB-QY-TIF"/>
@@ -20,7 +20,7 @@
                                 <rect key="frame" x="98" y="72" width="125" height="110"/>
                                 <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             </view>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4uj-yp-XE1" customClass="MyView" customModule="ch39p1123undoableDrag3" customModuleProvider="target">
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4uj-yp-XE1" customClass="MyView" customModule="ch39p1123undoableDrag4" customModuleProvider="target">
                                 <rect key="frame" x="98" y="72" width="125" height="110"/>
                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             </view>

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class ViewController : UIViewController, CNContactPickerDelegate, CNContactViewC`
`70`	`70`	`CNContactFamilyNameKey, CNContactGivenNameKey`
`71`	`71`	`])`
`72`	`72`	`matts = matts.filter{$0.familyName == "Neuburg"}`
`73`		`- guard var moi = matts.first else {`
	`73`	`+ guard let moi = matts.first else {`
`74`	`74`	`print("couldn't find myself")`
`75`	`75`	`return`
`76`	`76`	`}`
`@@ -89,7 +89,7 @@ class ViewController : UIViewController, CNContactPickerDelegate, CNContactViewC`
`89`	`89`	`stop.memory = true`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- guard var moi = matt else {`
	`92`	`+ guard let moi = matt else {`
`93`	`93`	`print("couldn't find myself")`
`94`	`94`	`return`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class MyTableViewController: UITableViewController {`
`61`	`61`	`cell.imageView!.image = nil`
`62`	`62`	`m.task = self.downloader.download(m.picurl) { // *`
`63`	`63`	`[weak self] url in // *`
`64`		`- m.task == nil // *`
	`64`	`+ m.task = nil // *`
`65`	`65`	`if url == nil {`
`66`	`66`	`return`
`67`	`67`	`}`