Updates to bring up to date with XCode6 Beta5

Author: nettlep

10. Properties.playground/section-1.swift

@@ -28,9 +28,9 @@ rangeOfThreeItems.firstValue = 6
 //
 // A Lazy Stored Property is a value that is not calculated until its first use.
 //
-// They are declared using the "@lazy" attribute and may not be constant.
+// They are declared using the "lazy" attribute and may not be constant.
 //
-// Global and local variables are all lazy, except that they don't need the @lazy attribute.
+// Global and local variables are all lazy, except that they don't need the lazy attribute.
 //
 // Here, we'll define a couple classes to showcase Lazy Stored Properties. In this example, let's
 // assume that DataImporter is a time-consuming process, and as such, we will want to use a lazy
@@ -43,14 +43,14 @@ class DataImporter
 
 class DataManager
 {
-	@lazy var importer = DataImporter()
+	lazy var importer = DataImporter()
 	var data = [String]()
 }
 
 // Now let's instantiate the data manager and add some simple data to the class:
 let manager = DataManager()
-manager.data += "Some data"
-manager.data += "Some more data"
+manager.data.append("Some data")
+manager.data.append("Some more data")
 
 // Notice how we haven't used the importer yet, so it is nil:
 manager
@@ -298,3 +298,4 @@ class SomeClass
 	// This is read-only, but you can also do read/write
 	class var computedTypeProperty: Int { return 4 }
 }
+

10. Properties.playground/timeline.xctimeline

@@ -3,7 +3,7 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=10168&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=424364807.022397">
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=10176&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=429121248.87547">
       </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>

13. Inheritance.playground/section-1.swift

@@ -31,7 +31,7 @@ class Vehicle
 class Bicycle: Vehicle
 {
 	// We'll make this a 2-wheeled vehicle
-	init()
+	override init()
 	{
 		super.init()
 		numberOfWheels = 2
@@ -46,7 +46,7 @@ bicycle.description()
 class Tandem: Bicycle
 {
 	// This bicycle has 2 passengers
-	init()
+	override init()
 	{
 		super.init()
 		maxPassengers = 2
@@ -61,7 +61,7 @@ class Car: Vehicle
 	var speed: Double = 0.0
 
 	// New initialization, starting with super.init()
-	init()
+	override init()
 	{
 		super.init()
 		maxPassengers = 5
@@ -143,21 +143,21 @@ automaticCar.gear
 // ------------------------------------------------------------------------------------------------
 // Preenting Overrides
 //
-// We can prevent a subclass from overriding a particular method or property using the '@final'
+// We can prevent a subclass from overriding a particular method or property using the 'final'
 // keyword.
 //
-// @final can be applied to: class, var, func, class methods and subscripts
+// final can be applied to: class, var, func, class methods and subscripts
 //
 // Here, we'll prevent an entire class from being subclassed by applying the . Because of this,
-// the @finals inside the class are not needed, but are present for descriptive purposes. These
-// additional @finals may not compile in the future, but they do today:
-@final class AnotherAutomaticCar: Car
+// the finals inside the class are not needed, but are present for descriptive purposes. These
+// additional finals may not compile in the future, but they do today:
+final class AnotherAutomaticCar: Car
 {
 	// This variable cannot be overridden
-	@final var gear = 1
+	final var gear = 1
 
 	// We can even prevent overridden functions from being further refined
-	@final override var speed: Double
+	final override var speed: Double
 	{
 		didSet { gear = Int(speed / 10.0) + 1 }
 	}

13. Inheritance.playground/timeline.xctimeline

@@ -3,7 +3,7 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=4410&amp;EndingColumnNumber=5&amp;EndingLineNumber=7&amp;StartingColumnNumber=4&amp;StartingLineNumber=7&amp;Timestamp=424369866.603036">
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=4430&amp;EndingColumnNumber=5&amp;EndingLineNumber=7&amp;StartingColumnNumber=4&amp;StartingLineNumber=7&amp;Timestamp=429121270.152136">
       </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>

14b. Initializer Chaining.playground/section-1.swift

@@ -95,7 +95,7 @@ class RecipeIngredient: Food
 	// Here, we'll create a convenience initializer that simply provides a default quantity
 	// value of 1. Note that in order for this to compile, we are required to call a designated
 	// initializer.
-	convenience init(name: String)
+	convenience override init(name: String)
 	{
 		self.init(name: name, quantity: 1)
 	}
@@ -118,7 +118,7 @@ class ShoppingListItem: RecipeIngredient
 	var purchased = false
 	var description: String
 	{
-		var output = "\(quantity) x \(name.lowercaseString)"
+		var output = "\(quantity) x \(name)"
 		output += purchased ? " ✔" : " ✘"
 		return output
 	}

14b. Initializer Chaining.playground/timeline.xctimeline

@@ -3,7 +3,7 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=7459&amp;EndingColumnNumber=5&amp;EndingLineNumber=26&amp;StartingColumnNumber=4&amp;StartingLineNumber=26&amp;Timestamp=424379045.424535">
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=7452&amp;EndingColumnNumber=5&amp;EndingLineNumber=26&amp;StartingColumnNumber=4&amp;StartingLineNumber=26&amp;Timestamp=429121086.671912">
       </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>

16. ARC.playground/section-1.swift

@@ -276,16 +276,16 @@ var america = Country(name: "USA", capitalName: "Washington DC")
 // Let's see how this problem can manifest. We'll create a class that represents an HTML element
 // which includes a variable (asHTML) which stores a reference to a closure.
 //
-// Quick note: The asHTML variable is defined as @lazy so that it can reference 'self' within the
-// closure. Try removing the '@lazy' and you'll see that you get an error trying to access 'self'.
+// Quick note: The asHTML variable is defined as lazy so that it can reference 'self' within the
+// closure. Try removing the 'lazy' and you'll see that you get an error trying to access 'self'.
 // This is an error because we're not allowed to access 'self' during Phase 1 initialization. By
-// making 'asHTML' @lazy, we solve this problem by deferring its initialization until later.
+// making 'asHTML' lazy, we solve this problem by deferring its initialization until later.
 class HTMLElement
 {
 	let name: String
 	let text: String?
 
-	@lazy var asHTML: () -> String =
+	lazy var asHTML: () -> String =
 	{
 		if let text = self.text
 		{
@@ -321,7 +321,7 @@ paragraph = nil
 //
 // Here's how we define a capture list:
 //
-//	@lazy var someClosure: (Int, String) -> String =
+//	lazy var someClosure: (Int, String) -> String =
 //	{
 //		[unowned self] (index: Int, stringToProcess: String) -> String in
 //
@@ -332,7 +332,7 @@ paragraph = nil
 // may not have any parameters. In both cases the method for declaring the capture list doesn't
 // change much. Simply include the capture list followed by the 'in' keyword:
 //
-//	@lazy var someClosure: () -> String =
+//	lazy var someClosure: () -> String =
 //	{
 //		[unowned self] in
 //
@@ -347,7 +347,7 @@ class FixedHTMLElement
 	let name: String
 	let text: String?
 
-	@lazy var asHTML: () -> String =
+	lazy var asHTML: () -> String =
 	{
 		[unowned self] in
 		if let text = self.text

16. ARC.playground/timeline.xctimeline

@@ -3,7 +3,7 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=14330&amp;EndingColumnNumber=5&amp;EndingLineNumber=17&amp;StartingColumnNumber=4&amp;StartingLineNumber=17&amp;Timestamp=424544773.38719">
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=14323&amp;EndingColumnNumber=5&amp;EndingLineNumber=17&amp;StartingColumnNumber=4&amp;StartingLineNumber=17&amp;Timestamp=429121230.809536">
       </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>

1a. The Basics.playground/section-1.swift

@@ -56,13 +56,12 @@ let π = 3.14159
 let 你好 = "你好世界"
 let 🐶🐮 = "dogcow"
 
-// You can print a value using println (this doesn't do anything in a playground, though)
+// You can print a value using println
 let fiveHundred = 500
 println("The current value of fiveHundred is: \(fiveHundred)")
 
-// Since println doesn't work in Playgrounds, we'll just put the raw string on the line
-// which is an expression that evaluates to itself, printing the result in the right-hand
-// pane in the playground, like so:
+// Since we're using Playgrounds, we'll just put the raw string on the line which is an expression
+// that evaluates to itself, printing the result in the right-hand pane in the playground, like so:
 "The current value of fiveHundred is: \(fiveHundred)"
 
 // ------------------------------------------------------------------------------------------------

1a. The Basics.playground/timeline.xctimeline

@@ -3,10 +3,10 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=8885&amp;EndingColumnNumber=5&amp;EndingLineNumber=4&amp;StartingColumnNumber=4&amp;StartingLineNumber=4&amp;Timestamp=424673361.066013">
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=8819&amp;EndingColumnNumber=5&amp;EndingLineNumber=4&amp;StartingColumnNumber=4&amp;StartingLineNumber=4&amp;Timestamp=429119882.388055">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=8062&amp;EndingColumnNumber=21&amp;EndingLineNumber=224&amp;StartingColumnNumber=4&amp;StartingLineNumber=224&amp;Timestamp=424673361.066013">
+         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=7996&amp;EndingColumnNumber=21&amp;EndingLineNumber=223&amp;StartingColumnNumber=4&amp;StartingLineNumber=223&amp;Timestamp=429119882.388055">
       </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>