Skip to content

Commit 7225f95

Browse files
author
Luc Dion
authored
Merge pull request #52 from mirego/swift_4_support
Changes to support Xcode 9 Beta 2 and Swift 4.
2 parents bbdf47d + a198200 commit 7225f95

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode8.3
33
xcode_project: PinLayout.xcodeproj
44
xcode_scheme: PinLayout
55
xcode_sdk: iphonesimulator9.3

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Nimble" "v6.1.0"
1+
github "Quick/Nimble" "v7.0.1"
22
github "Quick/Quick" "v1.1.0"

Sources/PinLayoutImpl+Warning.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ extension PinLayoutImpl {
4646
internal func warnConflict(_ context: Context, _ properties: [String: CGFloat]) {
4747
guard PinLayoutLogConflicts else { return }
4848
var warning = "\n👉 PinLayout Conflict: \(context()) won't be applied since it conflicts with the following already set properties:\n"
49-
properties.forEach { (key, value) in
50-
warning += " \(key): \(value)\n"
49+
properties.forEach { (property) in
50+
warning += " \(property.key): \(property.value)\n"
5151
}
5252

5353
displayWarning(warning)

0 commit comments

Comments
 (0)