Skip to content

Commit

Permalink
Merge pull request #7 from edjiang/master
Browse files Browse the repository at this point in the history
Updated for 8-18
  • Loading branch information
czechboy0 committed Aug 22, 2016
2 parents 48006c6 + 6e1776b commit 411f89d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DEVELOPMENT-SNAPSHOT-2016-07-25-a
DEVELOPMENT-SNAPSHOT-2016-08-18-a
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let package = Package(
Target(name: "SecretSocks")
],
dependencies: [
.Package(url: "https://github.com/czechboy0/Socks.git", majorVersion: 0, minor: 10),
.Package(url: "https://github.com/qutheory/tls.git", majorVersion: 0, minor: 4),
.Package(url: "https://github.com/czechboy0/Socks.git", majorVersion: 0, minor: 12),
.Package(url: "https://github.com/vapor/tls.git", majorVersion: 0, minor: 5),
]
)
2 changes: 1 addition & 1 deletion Tests/LinuxMain.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import XCTest
@testable import SecretSocksTestSuite
@testable import SecretSocksTests

XCTMain([
testCase(SecretSocksTests.allTests),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extension Sequence where Iterator.Element == UInt8 {
case .error:
break
case .scalarValue(let unicodeScalar):
str.append(unicodeScalar)
str.append(String(unicodeScalar))
}
}
}
Expand Down

0 comments on commit 411f89d

Please sign in to comment.