Merge branch 'master' into jw-1030

apple · Jun 19, 2019 · 39ceb4d · 39ceb4d
2 parents 484617b + 39e60dd
commit 39ceb4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Package.swift b/Package.swift
@@ -77,9 +77,6 @@ var targets: [PackageDescription.Target] = [
 
 let package = Package(
     name: "swift-nio",
-    platforms: [
-        .macOS(.v10_12), .iOS(.v10), .watchOS(.v3), .tvOS(.v10),
-    ],
     products: [
         .executable(name: "NIOEchoServer", targets: ["NIOEchoServer"]),
         .executable(name: "NIOEchoClient", targets: ["NIOEchoClient"]),

diff --git a/Tests/NIOTests/TestUtils.swift b/Tests/NIOTests/TestUtils.swift
@@ -106,7 +106,11 @@ var temporaryDirectory: String {
 #elseif os(Linux)
         return "/tmp"
 #else
-        return FileManager.default.temporaryDirectory.path
+        if #available(OSX 10.12, *) {
+            return FileManager.default.temporaryDirectory.path
+        } else {
+            return "/tmp"
+        }
 #endif
     }
 }

diff --git a/docker/docker-compose.1604.51.yaml b/docker/docker-compose.1604.51.yaml
@@ -8,7 +8,7 @@ services:
       args:
         ubuntu_version: "16.04"
         swift_version: "5.1"
-        swift_flavour: "DEVELOPMENT-SNAPSHOT-2019-05-29-a"
+        swift_flavour: "DEVELOPMENT-SNAPSHOT-2019-06-17-a"
         swift_builds_suffix: "branch"
         skip_ruby_from_ppa: "true"