Browse Source

[Issue #357] Resolving issues with Xcode 6.3 Beta 2

Signed-off-by: Mattt Thompson <m@mattt.me>
Aron Cedercrantz 11 years ago
parent
commit
2f39b8634a
2 changed files with 5 additions and 5 deletions
  1. 4 4
      Example/AppDelegate.swift
  2. 1 1
      Source/Alamofire.swift

+ 4 - 4
Example/AppDelegate.swift

@@ -29,9 +29,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
 
 
     // MARK: - UIApplicationDelegate
     // MARK: - UIApplicationDelegate
 
 
-    func application(application: UIApplication!, didFinishLaunchingWithOptions launchOptions: NSDictionary!) -> Bool {
-        let splitViewController = self.window!.rootViewController as UISplitViewController
-        let navigationController = splitViewController.viewControllers.last as UINavigationController
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
+        let splitViewController = self.window!.rootViewController as! UISplitViewController
+        let navigationController = splitViewController.viewControllers.last as! UINavigationController
         navigationController.topViewController.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem()
         navigationController.topViewController.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem()
         splitViewController.delegate = self
         splitViewController.delegate = self
 
 
@@ -40,7 +40,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
 
 
     // MARK: - UISplitViewControllerDelegate
     // MARK: - UISplitViewControllerDelegate
 
 
-    func splitViewController(splitViewController: UISplitViewController!, collapseSecondaryViewController secondaryViewController:UIViewController!, ontoPrimaryViewController primaryViewController:UIViewController!) -> Bool {
+    func splitViewController(splitViewController: UISplitViewController, collapseSecondaryViewController secondaryViewController: UIViewController!, ontoPrimaryViewController primaryViewController: UIViewController!) -> Bool {
         if let secondaryAsNavController = secondaryViewController as? UINavigationController {
         if let secondaryAsNavController = secondaryViewController as? UINavigationController {
             if let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController {
             if let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController {
                 return topAsDetailController.request == nil
                 return topAsDetailController.request == nil

+ 1 - 1
Source/Alamofire.swift

@@ -88,7 +88,7 @@ public enum ParameterEncoding {
                 var components: [(String, String)] = []
                 var components: [(String, String)] = []
                 for key in sorted(Array(parameters.keys), <) {
                 for key in sorted(Array(parameters.keys), <) {
                     let value: AnyObject! = parameters[key]
                     let value: AnyObject! = parameters[key]
-                    components += queryComponents(key, value)
+                    components += self.queryComponents(key, value)
                 }
                 }
 
 
                 return join("&", components.map{"\($0)=\($1)"} as [String])
                 return join("&", components.map{"\($0)=\($1)"} as [String])