Skip to content

Commit

Permalink
Merge pull request #74 from iZettle/bump-1.5.1
Browse files Browse the repository at this point in the history
Bumped version to 1.5.1
  • Loading branch information
mansbernhardt authored Feb 13, 2019
2 parents ecd372b + 5a9d734 commit eebfc95
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 28 deletions.
28 changes: 2 additions & 26 deletions Flow/Either.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,5 @@ public extension Either where Left == Right {
}
}

extension Either: Equatable where Left: Equatable, Right: Equatable {
public static func == (lhs: Either, rhs: Either) -> Bool {
switch (lhs, rhs) {
case (.right(let left), .right(let right)):
return left == right
case (.left(let left), .left(let right)):
return left == right
default:
return false
}
}
}

extension Either: Hashable where Left: Hashable, Right: Hashable {
// 1010101.... in binary
private var binaryDistinguisher: Int {
return Int.max / 3 * 2 + 1
}

public var hashValue: Int {
switch self {
case .left(let left): return left.hashValue
case .right(let right): return right.hashValue ^ binaryDistinguisher
}
}
}
extension Either: Equatable where Left: Equatable, Right: Equatable {}
extension Either: Hashable where Left: Hashable, Right: Hashable { }
2 changes: 1 addition & 1 deletion Flow/Info.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>1.5.0</string>
<string>1.5.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion FlowFramework.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "FlowFramework"
s.version = "1.5.0"
s.version = "1.5.1"
s.module_name = "Flow"
s.summary = "Working with asynchronous flows"
s.description = <<-DESC
Expand Down

0 comments on commit eebfc95

Please sign in to comment.