From 3466dbcdb6a88bcc56d2c2960fb8ed025d83ff3b Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Mon, 17 Jun 2019 21:33:45 +0900 Subject: [PATCH] Add Package.swift for Swift5 --- Package.swift | 8 ++++++-- Package@swift-4.2.swift | 22 ++++++++++++++++++++++ test-linux.sh | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 Package@swift-4.2.swift diff --git a/Package.swift b/Package.swift index 915f37a..99c2890 100644 --- a/Package.swift +++ b/Package.swift @@ -1,9 +1,12 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.0 import PackageDescription let package = Package( name: "DifferenceKit", + platforms: [ + .iOS(.v9), .macOS(.v10_10), .tvOS(.v9), .watchOS(.v2) + ], products: [ .library(name: "DifferenceKit", targets: ["DifferenceKit"]) ], @@ -17,5 +20,6 @@ let package = Package( dependencies: ["DifferenceKit"], path: "Tests" ) - ] + ], + swiftLanguageVersions: [.v4_2, .v5] ) diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift new file mode 100644 index 0000000..2806aba --- /dev/null +++ b/Package@swift-4.2.swift @@ -0,0 +1,22 @@ +// swift-tools-version:4.2 + +import PackageDescription + +let package = Package( + name: "DifferenceKit", + products: [ + .library(name: "DifferenceKit", targets: ["DifferenceKit"]) + ], + targets: [ + .target( + name: "DifferenceKit", + path: "Sources" + ), + .testTarget( + name: "DifferenceKitTests", + dependencies: ["DifferenceKit"], + path: "Tests" + ) + ], + swiftLanguageVersions: [.v4_2] +) diff --git a/test-linux.sh b/test-linux.sh index 5a1c897..54f3254 100755 --- a/test-linux.sh +++ b/test-linux.sh @@ -18,7 +18,7 @@ if [[ `uname` == "Darwin" ]]; then echo "Starting to running tests on Linux by Docker..." docker-machine create --driver virtualbox $DOCKER_HOST_NAME || true - docker run -v $WORKING_DIR:$WORKING_DIR -w $WORKING_DIR -it --privileged swift:latest bash -c "$0" || true + docker run -v $WORKING_DIR:$WORKING_DIR -w $WORKING_DIR -it --privileged swift:latest bash -c "bash $0" || true docker-machine stop $DOCKER_HOST_NAME || true docker-machine rm -f $DOCKER_HOST_NAME || true echo "Finish"