Fix errors in CI test
This commit is contained in:
parent
d117e1e1c7
commit
e6fa16a9bb
|
@ -1 +1 @@
|
||||||
4.2
|
5.0
|
||||||
|
|
|
@ -4,7 +4,7 @@ os:
|
||||||
language: generic
|
language: generic
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: trusty
|
dist: trusty
|
||||||
osx_image: xcode10.1
|
osx_image: xcode10.2
|
||||||
install:
|
install:
|
||||||
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; fi
|
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; fi
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// swift-tools-version:4.2
|
// swift-tools-version:5.0
|
||||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
|
||||||
|
|
||||||
import PackageDescription
|
import PackageDescription
|
||||||
|
|
||||||
|
@ -11,5 +10,6 @@ let package = Package(
|
||||||
targets: [
|
targets: [
|
||||||
.target(name: "ULID"),
|
.target(name: "ULID"),
|
||||||
.testTarget(name: "ULIDTests", dependencies: ["ULID"])
|
.testTarget(name: "ULIDTests", dependencies: ["ULID"])
|
||||||
]
|
],
|
||||||
|
swiftLanguageVersions: [.v5]
|
||||||
)
|
)
|
||||||
|
|
|
@ -141,6 +141,7 @@ extension Data {
|
||||||
defer { dst.deallocate() }
|
defer { dst.deallocate() }
|
||||||
|
|
||||||
let work = UnsafeMutablePointer<UInt8>.allocate(capacity: 8)
|
let work = UnsafeMutablePointer<UInt8>.allocate(capacity: 8)
|
||||||
|
work.initialize(repeating: 0, count: 8)
|
||||||
defer { work.deallocate() }
|
defer { work.deallocate() }
|
||||||
|
|
||||||
while srcleft > 0 {
|
while srcleft > 0 {
|
||||||
|
|
|
@ -21,7 +21,7 @@ final class Base32Tests: XCTestCase {
|
||||||
0x00, 0x00, 0x00, 0x00, 0x01, 0x68, 0x3D, 0xD4, 0x19, 0x86,
|
0x00, 0x00, 0x00, 0x00, 0x01, 0x68, 0x3D, 0xD4, 0x19, 0x86,
|
||||||
0xFE, 0xB3, 0xF9, 0x57, 0xAF, 0x8B, 0x6F, 0x46, 0x79, 0x77
|
0xFE, 0xB3, 0xF9, 0x57, 0xAF, 0x8B, 0x6F, 0x46, 0x79, 0x77
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual(expected, data.base32EncodedString())
|
XCTAssertEqual(expected, data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b11111000, 0b00000000, 0b00000000, 0b00000000, 0b00000000
|
0b11111000, 0b00000000, 0b00000000, 0b00000000, 0b00000000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("Z0000000", data.base32EncodedString())
|
XCTAssertEqual("Z0000000", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000111, 0b11000000, 0b00000000, 0b00000000, 0b00000000
|
0b00000111, 0b11000000, 0b00000000, 0b00000000, 0b00000000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("0Z000000", data.base32EncodedString())
|
XCTAssertEqual("0Z000000", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000000, 0b00111110, 0b00000000, 0b00000000, 0b00000000
|
0b00000000, 0b00111110, 0b00000000, 0b00000000, 0b00000000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("00Z00000", data.base32EncodedString())
|
XCTAssertEqual("00Z00000", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000000, 0b00000001, 0b11110000, 0b00000000, 0b00000000
|
0b00000000, 0b00000001, 0b11110000, 0b00000000, 0b00000000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("000Z0000", data.base32EncodedString())
|
XCTAssertEqual("000Z0000", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000000, 0b00000000, 0b00001111, 0b10000000, 0b00000000
|
0b00000000, 0b00000000, 0b00001111, 0b10000000, 0b00000000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("0000Z000", data.base32EncodedString())
|
XCTAssertEqual("0000Z000", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000000, 0b00000000, 0b00000000, 0b01111100, 0b00000000
|
0b00000000, 0b00000000, 0b00000000, 0b01111100, 0b00000000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("00000Z00", data.base32EncodedString())
|
XCTAssertEqual("00000Z00", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11100000
|
0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11100000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("000000Z0", data.base32EncodedString())
|
XCTAssertEqual("000000Z0", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -93,7 +93,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111
|
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("0000000Z", data.base32EncodedString())
|
XCTAssertEqual("0000000Z", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -102,7 +102,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b10000100
|
0b10000100
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("GG======", data.base32EncodedString())
|
XCTAssertEqual("GG======", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -111,7 +111,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b10000100, 0b00100001
|
0b10000100, 0b00100001
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("GGGG====", data.base32EncodedString())
|
XCTAssertEqual("GGGG====", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -120,7 +120,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b10000100, 0b00100001, 0b00001000
|
0b10000100, 0b00100001, 0b00001000
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("GGGGG===", data.base32EncodedString())
|
XCTAssertEqual("GGGGG===", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -129,7 +129,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b10000100, 0b00100001, 0b00001000, 0b01000010
|
0b10000100, 0b00100001, 0b00001000, 0b01000010
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("GGGGGGG=", data.base32EncodedString())
|
XCTAssertEqual("GGGGGGG=", data.base32EncodedString())
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ final class Base32Tests: XCTestCase {
|
||||||
let bytes: [UInt8] = [
|
let bytes: [UInt8] = [
|
||||||
0b10000100
|
0b10000100
|
||||||
]
|
]
|
||||||
let data = Data(bytes: bytes)
|
let data = Data(bytes)
|
||||||
|
|
||||||
XCTAssertEqual("GG", data.base32EncodedString(padding: false))
|
XCTAssertEqual("GG", data.base32EncodedString(padding: false))
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,7 +67,7 @@ final class ULIDTests: XCTestCase {
|
||||||
0xE2, 0x56, 0xBA, 0xB4, 0xC3, 0x4C, 0x07, 0x57
|
0xE2, 0x56, 0xBA, 0xB4, 0xC3, 0x4C, 0x07, 0x57
|
||||||
]
|
]
|
||||||
|
|
||||||
let actual = ULID(ulidData: Data(bytes: expected))
|
let actual = ULID(ulidData: Data(expected))
|
||||||
|
|
||||||
XCTAssertNotNil(actual)
|
XCTAssertNotNil(actual)
|
||||||
XCTAssertEqual(expected, Array(actual!.ulidData))
|
XCTAssertEqual(expected, Array(actual!.ulidData))
|
||||||
|
|
|
@ -502,7 +502,7 @@
|
||||||
PRODUCT_NAME = ULID;
|
PRODUCT_NAME = ULID;
|
||||||
SDKROOT = macosx;
|
SDKROOT = macosx;
|
||||||
SKIP_INSTALL = YES;
|
SKIP_INSTALL = YES;
|
||||||
SWIFT_VERSION = 4.2;
|
SWIFT_VERSION = 5.0;
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -528,7 +528,7 @@
|
||||||
PRODUCT_NAME = ULID;
|
PRODUCT_NAME = ULID;
|
||||||
SDKROOT = macosx;
|
SDKROOT = macosx;
|
||||||
SKIP_INSTALL = YES;
|
SKIP_INSTALL = YES;
|
||||||
SWIFT_VERSION = 4.2;
|
SWIFT_VERSION = 5.0;
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
@ -549,7 +549,7 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "net.yaslab.ULIDTests-macOS";
|
PRODUCT_BUNDLE_IDENTIFIER = "net.yaslab.ULIDTests-macOS";
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SDKROOT = macosx;
|
SDKROOT = macosx;
|
||||||
SWIFT_VERSION = 4.2;
|
SWIFT_VERSION = 5.0;
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -570,7 +570,7 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "net.yaslab.ULIDTests-macOS";
|
PRODUCT_BUNDLE_IDENTIFIER = "net.yaslab.ULIDTests-macOS";
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SDKROOT = macosx;
|
SDKROOT = macosx;
|
||||||
SWIFT_VERSION = 4.2;
|
SWIFT_VERSION = 5.0;
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue