Convert to Swift 2.2

Core Image Explorer.xcodeproj/project.pbxproj

@@ -146,7 +146,8 @@
 		8319B4471A5CC7EB0040418B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0620;
+				LastSwiftUpdateCheck = 0730;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = objc.io;
 				TargetAttributes = {
 					8319B44E1A5CC7EB0040418B = {
@@ -245,6 +246,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -311,6 +313,7 @@
 				INFOPLIST_FILE = "Core Image Explorer/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.objc.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -322,6 +325,7 @@
 				INFOPLIST_FILE = "Core Image Explorer/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.objc.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

Core Image Explorer/FilterDetailViewController.swift

@@ -20,7 +20,7 @@ class FilterDetailViewController: UIViewController, UINavigationControllerDelega
 
         filter = CIFilter(name: filterName)
 
-        navigationItem.title = filter.attributes()![kCIAttributeFilterDisplayName] as? NSString
+        navigationItem.title = filter.attributes[kCIAttributeFilterDisplayName] as? String
 
         addSubviews()
     }
@@ -39,19 +39,19 @@ class FilterDetailViewController: UIViewController, UINavigationControllerDelega
     }
 
     func filterParameterDescriptors() -> [ScalarFilterParameter] {
-        var inputNames = (filter.inputKeys() as [String]).filter { (parameterName) -> Bool in
+        let inputNames = (filter.inputKeys as [String]).filter { (parameterName) -> Bool in
             return (parameterName as String) != "inputImage"
         }
 
-        let attributes = filter.attributes()!
+        let attributes = filter.attributes
 
         return inputNames.map { (inputName: String) -> ScalarFilterParameter in
-            let attribute = attributes[inputName] as [String : AnyObject]
+            let attribute = attributes[inputName] as! [String : AnyObject]
             // strip "input" from the start of the parameter name to make it more presentation-friendly
-            let displayName = inputName[advance(inputName.startIndex, 5)..<inputName.endIndex]
-            let minValue = attribute[kCIAttributeSliderMin] as Float
-            let maxValue = attribute[kCIAttributeSliderMax] as Float
-            let defaultValue = attribute[kCIAttributeDefault] as Float
+            let displayName = inputName[inputName.startIndex.advancedBy(5)..<inputName.endIndex]
+            let minValue = attribute[kCIAttributeSliderMin] as! Float
+            let maxValue = attribute[kCIAttributeSliderMax] as! Float
+            let defaultValue = attribute[kCIAttributeDefault] as! Float
 
             return ScalarFilterParameter(name: displayName, key: inputName,
                                          minimumValue: minValue, maximumValue: maxValue, currentValue: defaultValue)
@@ -65,11 +65,11 @@ class FilterDetailViewController: UIViewController, UINavigationControllerDelega
         filteredImageView.contentMode = .ScaleAspectFit
         filteredImageView.clipsToBounds = true
         filteredImageView.backgroundColor = view.backgroundColor
-        filteredImageView.setTranslatesAutoresizingMaskIntoConstraints(false)
+        filteredImageView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(filteredImageView)
 
         parameterAdjustmentView = ParameterAdjustmentView(frame: view.bounds, parameters: filterParameterDescriptors())
-        parameterAdjustmentView.setTranslatesAutoresizingMaskIntoConstraints(false)
+        parameterAdjustmentView.translatesAutoresizingMaskIntoConstraints = false
         parameterAdjustmentView.setAdjustmentDelegate(filteredImageView)
         view.addSubview(parameterAdjustmentView)
     }

Core Image Explorer/FilterListViewController.swift

@@ -41,8 +41,8 @@ class FilterListViewController: UITableViewController {
 
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         if segue.identifier == "showDetail" {
-            if let indexPath = tableView.indexPathForSelectedRow() {
-                var controller = segue.destinationViewController as FilterDetailViewController
+            if let indexPath = tableView.indexPathForSelectedRow {
+                let controller = segue.destinationViewController as! FilterDetailViewController
                 controller.filterName = filters[indexPath.row].filterName
                 tableView.deselectRowAtIndexPath(indexPath, animated: true)
             }

Core Image Explorer/FilteredImageView.swift

@@ -35,7 +35,7 @@ class FilteredImageView: GLKView, ParameterAdjustmentDelegate {
     }
 
     required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
+        super.init(coder: aDecoder)!
         clipsToBounds = true
         self.context = EAGLContext(API: .OpenGLES2)
         ciContext = CIContext(EAGLContext: context)
@@ -45,13 +45,13 @@ class FilteredImageView: GLKView, ParameterAdjustmentDelegate {
         if ciContext != nil && inputImage != nil && filter != nil {
             let inputCIImage = CIImage(image: inputImage)
             filter.setValue(inputCIImage, forKey: kCIInputImageKey)
-            if let outputImage = filter.outputImage {
+            if let _  = filter.outputImage {
                 clearBackground()
 
-                let inputBounds = inputCIImage.extent()
+                let inputBounds = inputCIImage!.extent
                 let drawableBounds = CGRect(x: 0, y: 0, width: self.drawableWidth, height: self.drawableHeight)
                 let targetBounds = imageBoundsForContentMode(inputBounds, toRect: drawableBounds)
-                ciContext.drawImage(filter.outputImage, inRect: targetBounds, fromRect: inputBounds)
+                ciContext.drawImage(filter.outputImage!, inRect: targetBounds, fromRect: inputBounds)
             }
         }
     }

Core Image Explorer/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -63,6 +63,12 @@
       "idiom" : "ipad",
       "filename" : "Icon~ipad@2x.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-83.5@2x.png",
+      "scale" : "2x"
     }
   ],
   "info" : {

Core Image Explorer/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.objc.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Core Image Explorer/LabeledSliderView.swift

@@ -33,25 +33,25 @@ class LabeledSliderView: UIView {
         slider.minimumValue = parameter.minimumValue!
         slider.maximumValue = parameter.maximumValue!
         slider.value = parameter.currentValue
-        slider.setTranslatesAutoresizingMaskIntoConstraints(false)
+        slider.translatesAutoresizingMaskIntoConstraints = false
         addSubview(slider)
 
-        slider.addTarget(self, action: "sliderTouchUpInside:", forControlEvents: .TouchUpInside)
-        slider.addTarget(self, action: "sliderValueDidChange:", forControlEvents: .ValueChanged)
+        slider.addTarget(self, action: #selector(LabeledSliderView.sliderTouchUpInside(_:)), forControlEvents: .TouchUpInside)
+        slider.addTarget(self, action: #selector(LabeledSliderView.sliderValueDidChange(_:)), forControlEvents: .ValueChanged)
 
         descriptionLabel = UILabel(frame: frame)
         descriptionLabel.font = UIFont.boldSystemFontOfSize(14)
         descriptionLabel.textColor = UIColor(white: 0.9, alpha: 1.0)
         descriptionLabel.text = parameter.name
-        descriptionLabel.setTranslatesAutoresizingMaskIntoConstraints(false)
+        descriptionLabel.translatesAutoresizingMaskIntoConstraints = false
         addSubview(descriptionLabel)
 
         valueLabel = UILabel(frame: frame)
         valueLabel.font = UIFont.systemFontOfSize(14)
         valueLabel.textColor = UIColor(white: 0.9, alpha: 1.0)
         valueLabel.textAlignment = .Right
         valueLabel.text = slider.value.description
-        valueLabel.setTranslatesAutoresizingMaskIntoConstraints(false)
+        valueLabel.translatesAutoresizingMaskIntoConstraints = false
         addSubview(valueLabel)
     }
 

Core Image Explorer/ParameterAdjustmentView.swift

@@ -46,7 +46,7 @@ class ParameterAdjustmentView: UIView {
             let frame = CGRectMake(0, yOffset, bounds.size.width, kSliderHeight)
 
             let sliderView = LabeledSliderView(frame: frame, parameter: param)
-            sliderView.setTranslatesAutoresizingMaskIntoConstraints(false)
+            sliderView.translatesAutoresizingMaskIntoConstraints = false
             addSubview(sliderView)
 
             sliderViews.append(sliderView)

Core Image Explorer/PhotoFilterCollectionViewCell.swift

@@ -21,7 +21,7 @@ class PhotoFilterCollectionViewCell: UICollectionViewCell {
     }
 
     required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
+        super.init(coder: aDecoder)!
         addSubviews()
     }
 

Core Image Explorer/PhotoFilterViewController.swift

@@ -30,7 +30,7 @@ class PhotoFilterViewController: UIViewController, UICollectionViewDataSource, U
         super.viewDidLoad()
 
         for descriptor in filterDescriptors {
-            filters.append(CIFilter(name: descriptor.filterName))
+            filters.append(CIFilter(name: descriptor.filterName)!)
         }
 
         filteredImageView.inputImage = UIImage(named: kSampleImageName)
@@ -51,7 +51,7 @@ class PhotoFilterViewController: UIViewController, UICollectionViewDataSource, U
     }
 
     func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCellWithReuseIdentifier("PhotoFilterCell", forIndexPath: indexPath) as PhotoFilterCollectionViewCell
+        let cell = collectionView.dequeueReusableCellWithReuseIdentifier("PhotoFilterCell", forIndexPath: indexPath) as! PhotoFilterCollectionViewCell
         cell.filteredImageView.contentMode = .ScaleAspectFill
         cell.filteredImageView.inputImage = filteredImageView.inputImage
         cell.filteredImageView.filter = filters[indexPath.item]