Skip to content

Commit ee9ee8a

Browse files
lsecreaselsecrease
lsecrease
authored and
lsecrease
committed
Update to Swift 2.0
1 parent ef6a314 commit ee9ee8a

File tree

63 files changed

+727
-2844
lines changed

Some content is hidden

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

63 files changed

+727
-2844
lines changed

‎Cluster.xcodeproj/project.pbxproj‎

Lines changed: 178 additions & 176 deletions
Large diffs are not rendered by default.

‎Cluster.xcodeproj/xcuserdata/lawrenceolivier.xcuserdatad/xcschemes/Cluster.xcscheme‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0710"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "CEA8EA0B1B854B2100DC2AA5"
18+
BuildableName = "Cluster.app"
19+
BlueprintName = "Cluster"
20+
ReferencedContainer = "container:Cluster.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "CEA8EA201B854B2100DC2AA5"
36+
BuildableName = "ClusterTests.xctest"
37+
BlueprintName = "ClusterTests"
38+
ReferencedContainer = "container:Cluster.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "CEA8EA0B1B854B2100DC2AA5"
46+
BuildableName = "Cluster.app"
47+
BlueprintName = "Cluster"
48+
ReferencedContainer = "container:Cluster.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "CEA8EA0B1B854B2100DC2AA5"
69+
BuildableName = "Cluster.app"
70+
BlueprintName = "Cluster"
71+
ReferencedContainer = "container:Cluster.xcodeproj">
72+
</BuildableReference>
73+
</BuildableProductRunnable>
74+
<AdditionalOptions>
75+
</AdditionalOptions>
76+
</LaunchAction>
77+
<ProfileAction
78+
buildConfiguration = "Release"
79+
shouldUseLaunchSchemeArgsEnv = "YES"
80+
savedToolIdentifier = ""
81+
useCustomWorkingDirectory = "NO"
82+
debugDocumentVersioning = "YES">
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
85+
<BuildableReference
86+
BuildableIdentifier = "primary"
87+
BlueprintIdentifier = "CEA8EA0B1B854B2100DC2AA5"
88+
BuildableName = "Cluster.app"
89+
BlueprintName = "Cluster"
90+
ReferencedContainer = "container:Cluster.xcodeproj">
91+
</BuildableReference>
92+
</BuildableProductRunnable>
93+
</ProfileAction>
94+
<AnalyzeAction
95+
buildConfiguration = "Debug">
96+
</AnalyzeAction>
97+
<ArchiveAction
98+
buildConfiguration = "Release"
99+
revealArchiveInOrganizer = "YES">
100+
</ArchiveAction>
101+
</Scheme>

‎Cluster.xcodeproj/xcuserdata/lawrenceolivier.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>Cluster.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>CEA8EA0B1B854B2100DC2AA5</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
<key>CEA8EA201B854B2100DC2AA5</key>
21+
<dict>
22+
<key>primary</key>
23+
<true/>
24+
</dict>
25+
</dict>
26+
</dict>
27+
</plist>

‎Cluster.xcworkspace/xcuserdata/lawrenceolivier.xcuserdatad/UserInterfaceState.xcuserstate‎

19.5 KB
Binary file not shown.

‎Cluster/Base.lproj/Main.storyboard‎

Lines changed: 45 additions & 20 deletions
Large diffs are not rendered by default.

‎Cluster/CAPSPageMenu.swift‎

Lines changed: 51 additions & 51 deletions
Large diffs are not rendered by default.

‎Cluster/EditProfileTableViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class EditProfileTableViewController: UITableViewController, UIImagePickerContro
165165

166166
@IBAction func deleteAccountButtonTapped(sender: DesignableButton) {
167167

168-
println("Delete Account Button Tapped")
168+
print("Delete Account Button Tapped")
169169
}
170170

171171
}

ImagePickerSheet6.4/AnimationController.swift renamed to Cluster/ImagePickerSheet/AnimationController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AnimationController: NSObject, UIViewControllerAnimatedTransitioning {
2222

2323
// MARK: - UIViewControllerAnimatedTransitioning
2424

25-
func transitionDuration(transitionContext: UIViewControllerContextTransitioning) -> NSTimeInterval {
25+
func transitionDuration(transitionContext: UIViewControllerContextTransitioning?) -> NSTimeInterval {
2626
return 0.3
2727
}
2828

@@ -38,7 +38,7 @@ class AnimationController: NSObject, UIViewControllerAnimatedTransitioning {
3838
// MARK: - Animation
3939

4040
private func animatePresentation(context: UIViewControllerContextTransitioning) {
41-
let containerView = context.containerView()
41+
let containerView = context.containerView()!
4242
containerView.addSubview(imagePickerSheetController.view)
4343

4444
let tableViewOriginY = imagePickerSheetController.tableView.frame.origin.y
@@ -54,7 +54,7 @@ class AnimationController: NSObject, UIViewControllerAnimatedTransitioning {
5454
}
5555

5656
private func animateDismissal(context: UIViewControllerContextTransitioning) {
57-
let containerView = context.containerView()
57+
let containerView = context.containerView()!
5858

5959
UIView.animateWithDuration(transitionDuration(context), animations: {
6060
self.imagePickerSheetController.tableView.frame.origin.y = containerView.bounds.maxY

ImagePickerSheet6.4/ImageAction.swift renamed to Cluster/ImagePickerSheet/ImageAction.swift

File renamed without changes.

ImagePickerSheet6.4/ImageCollectionViewCell.swift renamed to Cluster/ImagePickerSheet/ImageCollectionViewCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ImageCollectionViewCell : UICollectionViewCell {
2626
}
2727

2828
required init(coder aDecoder: NSCoder) {
29-
super.init(coder: aDecoder)
29+
super.init(coder: aDecoder)!
3030

3131
initialize()
3232
}

0 commit comments

Comments
 (0)