Skip to content

Commit

Permalink
Merge branch 'release/3.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Krüger committed Apr 3, 2017
2 parents f5977b1 + f3ceb43 commit 5594f60
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Manuscript-Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.1</string>
<string>3.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Manuscript-iOSTests/TestHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct Helper {
}

XCTAssertEqual(constraint.secondAttribute, relatedAttribute, "")
XCTAssertEqualWithAccuracy(constraint.multiplier, multiplier, accuracy: CGFloat(FLT_EPSILON), "")
XCTAssertEqualWithAccuracy(constraint.multiplier, multiplier, accuracy: CGFloat(Float.ulpOfOne), "")
XCTAssertEqual(constraint.constant, constant, "")
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Info-iOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.1</string>
<string>3.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/Info-tvOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.1</string>
<string>3.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/LayoutProxy.swift
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ extension Manuscript {
if let target = Manuscript.findCommonSuperview(item, b: relatedView) {
return self.installConstraint(constraint, onTarget: target)
} else {
fatalError("couldn't find common ancestors for \(item) and \(relatedView) (while trying to install \(constraint))")
fatalError("couldn't find common ancestors for \(item) and \(String(describing: relatedView)) (while trying to install \(constraint))")
}
}

Expand Down

0 comments on commit 5594f60

Please sign in to comment.