Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Update to Swift 5.1, fix linter error #62

Merged
merged 3 commits into from
Oct 2, 2019
Merged

ci: Update to Swift 5.1, fix linter error #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
302276f
ci: Update to Swift 5.1
djones6 Sep 27, 2019
667ae53
Remove redundant OS guards around identical cases
djones6 Sep 27, 2019
83769d3
Remove compile warning with future versions of Swift
djones6 Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.2
5.1
12 changes: 10 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,17 @@ matrix:
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.0.2-xenial
env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
env: DOCKER_IMAGE=swift:5.1
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
- os: osx
osx_image: xcode9.2
sudo: required
Expand All @@ -52,6 +57,9 @@ matrix:
osx_image: xcode10.2
sudo: required
env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
- os: osx
osx_image: xcode11
sudo: required
- os: osx
osx_image: xcode11
sudo: required
Expand Down
2 changes: 1 addition & 1 deletion Sources/Cryptor/Status.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public enum CryptorError: Swift.Error, CustomStringConvertible {
case .invalidIVSizeOrLength:
return "Invalid IV size or length."

case .fail(let (_, reason)):
case .fail(_, let reason):
return reason
}
}
Expand Down
25 changes: 0 additions & 25 deletions Sources/Cryptor/StreamCryptor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ public class StreamCryptor {
///
public enum Algorithm {

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

/// Advanced Encryption Standard
/// - Note: aes and aes128 are equivalent.
case aes, aes128, aes192, aes256
Expand All @@ -232,29 +230,6 @@ public class StreamCryptor {
/// blowfish
case blowfish

#elseif os(Linux)

/// Advanced Encryption Standard
/// - Note: aes and aes128 are equivalent.
case aes, aes128, aes192, aes256

/// Data Encryption Standard
case des

/// Triple des
case tripleDes

/// cast
case cast

/// rc2
case rc2

/// blowfish
case blowfish

#endif

/// Blocksize, in bytes, of algorithm.
public var blockSize: Int {

Expand Down