Merge pull request #135 from br1sk/swift-4.1

Update for Swift 4.1

Author: keith

.travis.yml

@@ -6,7 +6,7 @@ matrix:
       env: ACTION=lint
 
 language: swift
-osx_image: xcode9.2
+osx_image: xcode9.3
 
 install: true
 script:

Brisk.xcodeproj/project.pbxproj

@@ -747,6 +747,7 @@
 				INFOPLIST_FILE = Brisk/Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = com.brisk.Brisk;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
@@ -761,6 +762,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' '@loader_path/../Frameworks'";
 				PRODUCT_BUNDLE_IDENTIFIER = com.brisk.BriskTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Brisk.app/Contents/MacOS/Brisk";
 			};
@@ -776,6 +778,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' '@loader_path/../Frameworks'";
 				PRODUCT_BUNDLE_IDENTIFIER = com.brisk.BriskTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Brisk.app/Contents/MacOS/Brisk";
 			};
@@ -788,6 +791,7 @@
 				INFOPLIST_FILE = BriskUITests/Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = com.brisk.BriskUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -799,6 +803,7 @@
 				INFOPLIST_FILE = BriskUITests/Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = com.brisk.BriskUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;

Brisk.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Brisk/AppDelegate.swift

@@ -91,7 +91,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         if let radarID = radarLink.flatMap(radarID(from:)) {
             _ = self.dupeRadarMenuItem.target!.perform(self.dupeRadarMenuItem.action!)
             let viewController = NSApp.windows
-                .flatMap { $0.contentViewController as? FileDuplicateViewController }
+                .compactMap { $0.contentViewController as? FileDuplicateViewController }
                 .first!
             viewController.searchForOpenRadar(text: radarID)
         } else {

Brisk/Extensions/Attachment+Serialization.swift

@@ -24,10 +24,4 @@ public extension Attachment {
 
         self.init(filename: filename, mimeType: mimeType, data: data)
     }
-
-    public init(filename: String, mimeType: String, data: Data) {
-        self.filename = filename
-        self.mimeType = mimeType
-        self.data = data
-    }
 }

Brisk/Extensions/Radar+Serialization.swift

@@ -43,7 +43,7 @@ public extension Radar {
         let areaID = json["area_id"] as? Int
         let applicationID = json["application_id"] as? String
         let userID = json["user_id"] as? String
-        let attachments = (json["attachments"] as? [[String: Any]] ?? []).flatMap(Attachment.init)
+        let attachments = (json["attachments"] as? [[String: Any]] ?? []).compactMap(Attachment.init)
 
         let classification = Classification.All.first { $0.appleIdentifier == classificationID }
             ?? Classification.All.first!

BriskTests/RadarSerializationTests.swift

@@ -2,13 +2,6 @@ import Brisk
 import Sonar
 import XCTest
 
-private extension Area {
-    init(appleIdentifier: Int, name: String) {
-        self.appleIdentifier = appleIdentifier
-        self.name = name
-    }
-}
-
 final class RadarSerializationTests: XCTestCase {
     func testSerializingRadar() {
         let attachment = Attachment(filename: "foo.png", mimeType: "image/png",

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Enhancements
 
+- Update project to Swift 4.1 and Xcode 9.3
+  [change](https://github.com/br1sk/brisk/pull/135)
+
 - Update project to Swift 4.0 and Xcode 9.2
   [change](https://github.com/br1sk/brisk/pull/126)
 

Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - Alamofire (4.4.0)
+  - Alamofire (4.7.2)
   - Sonar (0.0.1):
-    - Alamofire (~> 4.4.0)
+    - Alamofire (~> 4.7.2)
   - Sparkle (1.17.0)
 
 DEPENDENCIES:
@@ -14,12 +14,12 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   Sonar:
-    :commit: 6f7bdec229b82a8bedc45fa063c996718fb5e6b1
+    :commit: eccff834ccef886f450a33f8668f7649ca5f328e
     :git: https://github.com/br1sk/Sonar.git
 
 SPEC CHECKSUMS:
-  Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
-  Sonar: edb54e18872e0d23052f60e453edef60ba4ac5fa
+  Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
+  Sonar: 96b87f9048b557dfbcd331c5d3598b8f92724d0d
   Sparkle: ccfb47699feea7b40b51cf3176f69404e5b1da6c
 
 PODFILE CHECKSUM: 31638d14e4cbdaed3252aafe998baf86f9c87574