Skip to content

Commit a34e157

Browse files
nettlepnettlep
committed
Updated to support XCode 6.0 GM.
This includes the latest updates to the language specification but also alters the project settings for the playgrounds to target 'iossimulator' rather than 'macosx'. This was necessary as the release of XCode 6.0 GM broke playgrounds that targeted OSX. This new configuration does work on both of the current versions of XCode (6.0 GM and 6.1 Beta 2)
1 parent af42c38 commit a34e157

File tree

47 files changed

+85
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+85
-135
lines changed

‎10. Properties.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎11. Methods.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎12. Subscripts.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎13. Inheritance.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎14a. Initialization.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎14b. Initializer Chaining.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎15. Deinitialization.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎16. ARC.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎17. Optional Chaining.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎18. Type Casting.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎19. Nested Types.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎19. Nested Types.playground/section-1.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct BlackjackCard
5454
case .Jack, .Queen, .King:
5555
return Values(first: 10, second: nil)
5656
default:
57-
return Values(first: self.toRaw(), second: nil)
57+
return Values(first: self.rawValue, second: nil)
5858
}
5959
}
6060
}
@@ -65,7 +65,7 @@ struct BlackjackCard
6565

6666
var description: String
6767
{
68-
var output = "A \(suit.toRaw()) with a value of \(rank.values.first)"
68+
var output = "A \(suit.rawValue) with a value of \(rank.values.first)"
6969
if let second = rank.values.second
7070
{
7171
output += " or \(second)"
@@ -84,4 +84,4 @@ let theAceOfSpades = BlackjackCard(rank: .Ace, suit: .Spades)
8484
theAceOfSpades.description
8585

8686
// To access the nested type, we can drill down into the type using type names:
87-
let heartsSymbol = String( BlackjackCard.Suit.Hearts.toRaw() )
87+
let heartsSymbol = String( BlackjackCard.Suit.Hearts.rawValue )

‎19. Nested Types.playground/timeline.xctimeline

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version = "3.0">
44
<TimelineItems>
55
<LoggerValueHistoryTimelineItem
6-
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=3044&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=424626841.358527">
6+
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=3047&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=432601065.869592">
77
</LoggerValueHistoryTimelineItem>
88
</TimelineItems>
99
</Timeline>

‎1a. The Basics.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎1b. Type alliases.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎1c. Tuples.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎1d. Optionals.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎1d. Optionals.playground/section-1.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ assumedString = nil
176176
// let errorString: String = assumedString
177177

178178
// Like any other optional, we can still check if it holds a value:
179-
if assumedString
179+
if assumedString != nil
180180
{
181181
"We have a value"
182182
}

‎1d. Optionals.playground/timeline.xctimeline

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version = "3.0">
44
<TimelineItems>
55
<LoggerValueHistoryTimelineItem
6-
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=6943&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=429120028.697866">
6+
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=6950&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=432600545.276631">
77
</LoggerValueHistoryTimelineItem>
88
</TimelineItems>
99
</Timeline>

‎1e. Assertions.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎2. Basic operations.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎2. Basic operations.playground/section-1.swift

+3-8
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,10 @@ a + b
7676
// String concatenation uses the + operator:
7777
"hello, " + "world"
7878

79-
// You can add characters, too, which form a string
79+
// To add characters, convert them to a string
8080
let dog: Character = "🐶"
81-
let cow: Character = "🐮" // Why is this an "Enum Value" ?
82-
let dogCow = dog + cow
83-
84-
// You can also add characters to a string
85-
let str = "abc"
86-
let chr: Character = "d"
87-
chr + str + chr
81+
let cow: Character = "🐮"
82+
let dogCow = String(dog) + String(cow)
8883

8984
// Ternary operators work on three targets:
9085
truefalse ? a : b

‎2. Basic operations.playground/timeline.xctimeline

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version = "3.0">
44
<TimelineItems>
55
<LoggerValueHistoryTimelineItem
6-
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=3545&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=424365404.031085">
6+
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=3422&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=432600756.313844">
77
</LoggerValueHistoryTimelineItem>
88
</TimelineItems>
99
</Timeline>

‎20. Extensions.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎20. Extensions.playground/section-1.swift

-12
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,3 @@ extension Character
187187
Character("a").kind == .Vowel
188188
Character("h").kind == .Consonant
189189
Character("+").kind == .Other
190-
191-
192-
193-
194-
195-
196-
197-
198-
199-
200-
201-

‎20. Extensions.playground/timeline.xctimeline

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version = "3.0">
44
<TimelineItems>
55
<LoggerValueHistoryTimelineItem
6-
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=5377&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=429121495.027786">
6+
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=5366&amp;EndingColumnNumber=5&amp;EndingLineNumber=2&amp;StartingColumnNumber=4&amp;StartingLineNumber=2&amp;Timestamp=432601082.881947">
77
</LoggerValueHistoryTimelineItem>
88
</TimelineItems>
99
</Timeline>

‎21. Protocols.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎22. Generics.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎23. Advanced Operators.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎3. Strings and Characters.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎3. Strings and Characters.playground/section-1.swift

-8
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,6 @@ countElements(originalString)
6969
// Strings can be concatenated with strings and characters
7070
var helloworld = "hello, " + "world"
7171

72-
// Add a character
73-
var bang: Character = "!"
74-
helloworld + bang
75-
76-
// Concatenate a character onto the end of the string
77-
helloworld += bang
78-
helloworld
79-
8072
// ------------------------------------------------------------------------------------------------
8173
// String interpolation
8274
//

‎3. Strings and Characters.playground/timeline.xctimeline

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version = "3.0">
44
<TimelineItems>
55
<LoggerValueHistoryTimelineItem
6-
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=3442&amp;EndingColumnNumber=5&amp;EndingLineNumber=9&amp;StartingColumnNumber=4&amp;StartingLineNumber=9&amp;Timestamp=428206997.492356">
6+
documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=3293&amp;EndingColumnNumber=5&amp;EndingLineNumber=9&amp;StartingColumnNumber=4&amp;StartingLineNumber=9&amp;Timestamp=432600783.307522">
77
</LoggerValueHistoryTimelineItem>
88
</TimelineItems>
99
</Timeline>

‎4a. Arrays.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

‎4b. Dictionaries.playground/contents.xcplayground

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='3.0' sdk='macosx'>
2+
<playground version='3.0' sdk='iphonesimulator'>
33
<sections>
44
<code source-file-name='section-1.swift'/>
55
</sections>
66
<timeline fileName='timeline.xctimeline'/>
7-
</playground>
7+
</playground>

0 commit comments

Comments
 (0)