Skip to content

Commit 7ffd901

Browse files
committed
Update for Swift 4.1
1 parent 2f524dc commit 7ffd901

File tree

8 files changed

+20
-14
lines changed

8 files changed

+20
-14
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ matrix:
66
env: ACTION=lint
77

88
language: swift
9-
osx_image: xcode9.2
9+
osx_image: xcode9.3
1010

1111
install: true
1212
script:

Brisk.xcodeproj/project.pbxproj

+1
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,7 @@
747747
INFOPLIST_FILE = Brisk/Resources/Info.plist;
748748
PRODUCT_BUNDLE_IDENTIFIER = com.brisk.Brisk;
749749
PRODUCT_NAME = "$(TARGET_NAME)";
750+
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
750751
SWIFT_VERSION = 4.0;
751752
};
752753
name = Release;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Brisk/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
9191
if let radarID = radarLink.flatMap(radarID(from:)) {
9292
_ = self.dupeRadarMenuItem.target!.perform(self.dupeRadarMenuItem.action!)
9393
let viewController = NSApp.windows
94-
.flatMap { $0.contentViewController as? FileDuplicateViewController }
94+
.compactMap { $0.contentViewController as? FileDuplicateViewController }
9595
.first!
9696
viewController.searchForOpenRadar(text: radarID)
9797
} else {

Brisk/Extensions/Attachment+Serialization.swift

-6
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ public extension Attachment {
2424

2525
self.init(filename: filename, mimeType: mimeType, data: data)
2626
}
27-
28-
public init(filename: String, mimeType: String, data: Data) {
29-
self.filename = filename
30-
self.mimeType = mimeType
31-
self.data = data
32-
}
3327
}

Brisk/Extensions/Radar+Serialization.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public extension Radar {
4343
let areaID = json["area_id"] as? Int
4444
let applicationID = json["application_id"] as? String
4545
let userID = json["user_id"] as? String
46-
let attachments = (json["attachments"] as? [[String: Any]] ?? []).flatMap(Attachment.init)
46+
let attachments = (json["attachments"] as? [[String: Any]] ?? []).compactMap(Attachment.init)
4747

4848
let classification = Classification.All.first { $0.appleIdentifier == classificationID }
4949
?? Classification.All.first!

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Enhancements
44

5+
- Update project to Swift 4.1 and Xcode 9.3
6+
[change](https://github.com/br1sk/brisk/pull/135)
7+
58
- Update project to Swift 4.0 and Xcode 9.2
69
[change](https://github.com/br1sk/brisk/pull/126)
710

Podfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PODS:
2-
- Alamofire (4.4.0)
2+
- Alamofire (4.7.2)
33
- Sonar (0.0.1):
4-
- Alamofire (~> 4.4.0)
4+
- Alamofire (~> 4.7.2)
55
- Sparkle (1.17.0)
66

77
DEPENDENCIES:
@@ -14,12 +14,12 @@ EXTERNAL SOURCES:
1414

1515
CHECKOUT OPTIONS:
1616
Sonar:
17-
:commit: 6f7bdec229b82a8bedc45fa063c996718fb5e6b1
17+
:commit: 34cf157e546c73889e91fc102e9fe64be98f5c81
1818
:git: https://github.com/br1sk/Sonar.git
1919

2020
SPEC CHECKSUMS:
21-
Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
22-
Sonar: edb54e18872e0d23052f60e453edef60ba4ac5fa
21+
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
22+
Sonar: 96b87f9048b557dfbcd331c5d3598b8f92724d0d
2323
Sparkle: ccfb47699feea7b40b51cf3176f69404e5b1da6c
2424

2525
PODFILE CHECKSUM: 31638d14e4cbdaed3252aafe998baf86f9c87574

0 commit comments

Comments
 (0)