diff --git a/.travis.yml b/.travis.yml index d0864a7..0bf438f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ matrix: - sudo apt-get install clang libicu-dev before_script: - wget "https://swift.org/builds/swift-5.0.3-release/ubuntu1604/swift-5.0.3-RELEASE/swift-5.0.3-RELEASE-ubuntu16.04.tar.gz" -O "/tmp/swift-5.0.3-RELEASE-ubuntu16.04.tar.gz" - - tar -xvf "/tmp/swift-5.0.3-RELEASE-ubuntu16.04.tar.gz" - - export PATH="$PATH:$PWD/swift-5.0.3-RELEASE-ubuntu16.04/bin" + - tar xzf "/tmp/swift-5.0.3-RELEASE-ubuntu16.04.tar.gz" + - export PATH="$PATH:$PWD/swift-5.0.3-RELEASE-ubuntu16.04/usr/bin" - os: osx osx_image: xcode11.3 diff --git a/Package.swift b/Package.swift index f2296c6..d067515 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.1 import PackageDescription @@ -31,7 +31,6 @@ let package = Package( name: "EchoTests", dependencies: ["Echo"] ) - ], - swiftLanguageVersions: [.v5] + ] ) diff --git a/Tests/EchoTests/Context Descriptor/AnonymousDescriptor.swift b/Tests/EchoTests/Context Descriptor/AnonymousDescriptor.swift index 3816c07..444d3c5 100644 --- a/Tests/EchoTests/Context Descriptor/AnonymousDescriptor.swift +++ b/Tests/EchoTests/Context Descriptor/AnonymousDescriptor.swift @@ -9,7 +9,9 @@ struct AnonymousFoo { let metadata = reflect(AnonymousBar.self) as! StructMetadata let parent = metadata.descriptor.parent! as! AnonymousDescriptor XCTAssertTrue(parent.anonymousFlags.hasMangledName) - let mangledName = try XCTUnwrap(parent.mangledName) + // XCTUnwrap is unavailble from swift test atm + //let mangledName = try XCTUnwrap(parent.mangledName) + let mangledName = parent.mangledName! XCTAssertEqual( mangledName, "$s9EchoTests12AnonymousFooV0C3Bar33_16BDE84827F25937B00C6B35A30DC536LLV" @@ -20,7 +22,9 @@ struct AnonymousFoo { let metadata = reflect(AnonymousGenericBar.self) as! StructMetadata let parent = metadata.descriptor.parent! as! AnonymousDescriptor XCTAssertTrue(parent.anonymousFlags.hasMangledName) - let mangledName = try XCTUnwrap(parent.mangledName) + // XCTUnwrap is unavailable from swift test atm + //let mangledName = try XCTUnwrap(parent.mangledName) + let mangledName = parent.mangledName! XCTAssertEqual( mangledName, "$s9EchoTests12AnonymousFooV0C10GenericBar33_16BDE84827F25937B00C6B35A30DC536LLV"