[focus-ios] Xcode 9 upgrade (mozilla-mobile/focus-ios#478)

* Xcode 9 upgrade * Xcode 9: unwrap server for building server url string
isabelrios · Sep 20, 2017 · a3e6488 · a3e6488
1 parent 1c7fe62
commit a3e6488
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/focus-ios/Blockzilla/BlockerEnabledDetector.swift b/focus-ios/Blockzilla/BlockerEnabledDetector.swift
@@ -24,7 +24,7 @@ class BlockerEnabledDetector: NSObject {
 }
 
 private class BlockerEnabledDetector9: BlockerEnabledDetector, SFSafariViewControllerDelegate {
-    private let server = GCDWebServer()!
+    private let server = GCDWebServer()
 
     private var svc: SFSafariViewController!
     private var callback: ((Bool) -> ())!
@@ -33,7 +33,7 @@ private class BlockerEnabledDetector9: BlockerEnabledDetector, SFSafariViewContr
     override init() {
         super.init()
 
-        server.addHandler(forMethod: "GET", path: "/enabled-detector", request: GCDWebServerRequest.self) { [weak self] request -> GCDWebServerResponse! in
+        server?.addHandler(forMethod: "GET", path: "/enabled-detector", request: GCDWebServerRequest.self) { [weak self] request -> GCDWebServerResponse! in
             if let loadedBlockedPage = request?.query["blocked"] as? String , loadedBlockedPage == "1" {
                 // Second page loaded, so we aren't blocked.
                 self?.enabled = false
@@ -46,12 +46,13 @@ private class BlockerEnabledDetector9: BlockerEnabledDetector, SFSafariViewContr
             return GCDWebServerDataResponse(html: "<html><head><meta http-equiv=\"refresh\" content=\"0; url=/enabled-detector?blocked=1\"></head></html>")
         }
 
-        server.start(withPort: 0, bonjourName: nil)
+        server?.start(withPort: 0, bonjourName: nil)
     }
 
     override func detectEnabled(_ parentView: UIView, callback: @escaping EnabledCallback) {
         guard self.svc == nil && self.callback == nil else { return }
-
+        guard let server = server else { return }
+
         enabled = true
         self.callback = callback
 
@@ -74,7 +75,7 @@ private class BlockerEnabledDetector9: BlockerEnabledDetector, SFSafariViewContr
     }
 
     deinit {
-        server.stop()
+        server?.stop()
     }
 }
 

diff --git a/focus-ios/Cartfile b/focus-ios/Cartfile
@@ -1,5 +1,5 @@
 github "swisspol/GCDWebServer" ~> 3.3.3
-github "SnapKit/SnapKit" "swift-4"
+github "SnapKit/SnapKit" "4.0.0"
 github "adjust/ios_sdk" ~> 4.10.2
 github "cezheng/Fuzi" "master"
 github "mozilla-mobile/AutocompleteTextField" "master"

diff --git a/focus-ios/Cartfile.resolved b/focus-ios/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
-github "SnapKit/SnapKit" "d31148f449abe819fd1a58d5e07e94874c7e6003"
+github "SnapKit/SnapKit" "4.0.0"
 github "adjust/ios_sdk" "v4.10.2"
 github "cezheng/Fuzi" "5ba8c81d90f6c2a973e88ebfcc95d24190d34641"
 github "mozilla-mobile/AutocompleteTextField" "a815acf9afdf03325cc9fa8bf3df9faa1394a558"