Updates for Swift 2.0 in Xcode 7.0 beta 4

smileyborg · smileyborg · commit daaef5e3185d · 2015-08-02T15:10:44.000-07:00
diff --git a/TableViewCellWithAutoLayout/TableViewController/TableViewCell.swift b/TableViewCellWithAutoLayout/TableViewController/TableViewCell.swift
@@ -26,7 +26,7 @@ class TableViewCell: UITableViewCell
         setupViews()
     }
     
-    required init(coder aDecoder: NSCoder)
+    required init?(coder aDecoder: NSCoder)
     {
         super.init(coder: aDecoder)
         
@@ -64,9 +64,7 @@ class TableViewCell: UITableViewCell
             // contentView.bounds = CGRect(x: 0.0, y: 0.0, width: 99999.0, height: 99999.0)
             
             // Prevent the two UILabels from being compressed below their intrinsic content height
-            // FIXME 7-Jun-14 Xcode 6b1: Apple Bug Report rdar://17220525: The UILayoutPriority enum is not compatible with Swift yet!
-            // As a temporary workaround, we're using the raw value of UILayoutPriorityRequired = 1000
-            UIView.autoSetPriority(1000) {
+            UIView.autoSetPriority(UILayoutPriorityRequired) {
                 self.titleLabel.autoSetContentCompressionResistancePriorityForAxis(.Vertical)
                 self.bodyLabel.autoSetContentCompressionResistancePriorityForAxis(.Vertical)
             }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class TableViewCell: UITableViewCell`
`26`	`26`	`setupViews()`
`27`	`27`	`}`
`28`	`28`
`29`		`- required init(coder aDecoder: NSCoder)`
	`29`	`+ required init?(coder aDecoder: NSCoder)`
`30`	`30`	`{`
`31`	`31`	`super.init(coder: aDecoder)`
`32`	`32`
`@@ -64,9 +64,7 @@ class TableViewCell: UITableViewCell`
`64`	`64`	`// contentView.bounds = CGRect(x: 0.0, y: 0.0, width: 99999.0, height: 99999.0)`
`65`	`65`
`66`	`66`	`// Prevent the two UILabels from being compressed below their intrinsic content height`
`67`		`- // FIXME 7-Jun-14 Xcode 6b1: Apple Bug Report rdar://17220525: The UILayoutPriority enum is not compatible with Swift yet!`
`68`		`- // As a temporary workaround, we're using the raw value of UILayoutPriorityRequired = 1000`
`69`		`- UIView.autoSetPriority(1000) {`
	`67`	`+ UIView.autoSetPriority(UILayoutPriorityRequired) {`
`70`	`68`	`self.titleLabel.autoSetContentCompressionResistancePriorityForAxis(.Vertical)`
`71`	`69`	`self.bodyLabel.autoSetContentCompressionResistancePriorityForAxis(.Vertical)`
`72`	`70`	`}`