Fixed Swift 3 and macOS compilation

PureSwift · Sep 15, 2018 · d83af64 · d83af64
1 parent 9151c7e
commit d83af64
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 5 deletions.
diff --git a/Sources/ZIPFoundation/Archive+Reading.swift b/Sources/ZIPFoundation/Archive+Reading.swift
@@ -10,6 +10,7 @@
 
 import Foundation
 
+@available(macOS 10.11, *)
 extension Archive {
     /// Read a ZIP `Entry` from the receiver and write it to `url`.
     ///

diff --git a/Sources/ZIPFoundation/Archive+Writing.swift b/Sources/ZIPFoundation/Archive+Writing.swift
@@ -10,6 +10,7 @@
 
 import Foundation
 
+@available(macOS 10.11, *)
 extension Archive {
     private enum ModifyOperation: Int {
         case remove = -1

diff --git a/Sources/ZIPFoundation/Archive.swift b/Sources/ZIPFoundation/Archive.swift
@@ -60,6 +60,8 @@ public enum CompressionMethod: UInt16 {
 ///     var archiveURL = URL(fileURLWithPath: "/path/file.zip")
 ///     var archive = Archive(url: archiveURL, accessMode: .update)
 ///     try archive?.addEntry("test.txt", relativeTo: baseURL, compressionMethod: .deflate)
+
+@available(macOS 10.11, *)
 public final class Archive: Sequence {
     typealias LocalFileHeader = Entry.LocalFileHeader
     typealias DataDescriptor = Entry.DataDescriptor
@@ -243,6 +245,7 @@ public final class Archive: Sequence {
     }
 }
 
+@available(macOS 10.11, *)
 extension Archive {
     /// The number of the work units that have to be performed when
     /// removing `entry` from the receiver.
@@ -301,6 +304,7 @@ extension Archive {
     }
 }
 
+@available(macOS 10.11, *)
 extension Archive.EndOfCentralDirectoryRecord {
     var data: Data {
         var endOfCentralDirectorySignature = self.endOfCentralDirectorySignature

diff --git a/Sources/ZIPFoundation/Data+Compression.swift b/Sources/ZIPFoundation/Data+Compression.swift
@@ -80,6 +80,7 @@ public let crcTable: [UInt32] = [
     0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
     0x2d02ef8d]
 
+@available(macOS 10.11, *)
 extension Data {
     enum CompressionError: Error {
         case invalidStream
@@ -137,6 +138,7 @@ extension Data {
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Compression
 
+@available(macOS 10.11, *)
 extension Data {
     @inline(__always)
     static func process(operation: compression_stream_operation, size: Int, bufferSize: Int,

diff --git a/Sources/ZIPFoundation/Data+Serialization.swift b/Sources/ZIPFoundation/Data+Serialization.swift
@@ -16,6 +16,7 @@ protocol DataSerializable {
     var data: Data { get }
 }
 
+@available(macOS 10.11, *)
 extension Data {
     enum DataError: Error {
         case unreadableFile

diff --git a/Sources/ZIPFoundation/Entry.swift b/Sources/ZIPFoundation/Entry.swift
@@ -15,6 +15,7 @@ import CoreFoundation
 ///
 /// You can retrieve instances of `Entry` from an `Archive` via subscripting or iteration.
 /// Entries are identified by their `path`.
+@available(macOS 10.11, *)
 public struct Entry: Equatable {
     /// The type of an `Entry` in a ZIP `Archive`.
     public enum EntryType: Int {
@@ -203,6 +204,7 @@ public struct Entry: Equatable {
     }
 }
 
+@available(macOS 10.11, *)
 extension Entry.LocalFileHeader {
     var data: Data {
         var localFileHeaderSignature = self.localFileHeaderSignature
@@ -257,6 +259,7 @@ extension Entry.LocalFileHeader {
     }
 }
 
+@available(macOS 10.11, *)
 extension Entry.CentralDirectoryStructure {
     var data: Data {
         var centralDirectorySignature = self.centralDirectorySignature
@@ -378,6 +381,7 @@ extension Entry.CentralDirectoryStructure {
     }
 }
 
+@available(macOS 10.11, *)
 extension Entry.DataDescriptor {
     init?(data: Data, additionalDataProvider provider: (Int) throws -> Data) {
         guard data.count == Entry.DataDescriptor.size else { return nil }

diff --git a/Sources/ZIPFoundation/FileManager+ZIP.swift b/Sources/ZIPFoundation/FileManager+ZIP.swift
@@ -10,6 +10,7 @@
 
 import Foundation
 
+@available(macOS 10.11, *)
 extension FileManager {
     typealias CentralDirectoryStructure = Entry.CentralDirectoryStructure
 

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationDataSerializationTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationDataSerializationTests.swift
@@ -11,6 +11,7 @@
 import XCTest
 @testable import ZIPFoundation
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     func testReadStructureErrorConditions() {
         let processInfo = ProcessInfo.processInfo

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationEntryTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationEntryTests.swift
@@ -11,6 +11,7 @@
 import XCTest
 @testable import ZIPFoundation
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     func testEntryWrongDataLengthErrorConditions() {
         let emptyCDS = Entry.CentralDirectoryStructure(data: Data(),

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationFileManagerTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationFileManagerTests.swift
@@ -11,6 +11,7 @@
 import XCTest
 @testable import ZIPFoundation
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     func testZipItem() {
         let fileManager = FileManager()
@@ -404,9 +405,10 @@ extension ZIPFoundationTests {
 // MARK: - Swift 3 compatibility
 
 #if swift(>=4.0)
-#else
+#elseif swift(>=3.0)
 internal extension FileManager {
-
+
+    @objc(swiftCreateFileAtPath:contents:attributes:)
     @discardableResult
     func createFile(atPath path: String,
                     contents: Data? = nil,

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationPerformanceTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationPerformanceTests.swift
@@ -11,6 +11,7 @@
 import XCTest
 @testable import ZIPFoundation
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     func testPerformanceWriteUncompressed() {
         let archive = self.archive(for: #function, mode: .create)

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationReadingTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationReadingTests.swift
@@ -11,6 +11,7 @@
 import XCTest
 @testable import ZIPFoundation
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     func testExtractUncompressedFolderEntries() {
         let archive = self.archive(for: #function, mode: .read)

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationTests.swift
@@ -16,7 +16,8 @@ enum AdditionalDataError: Error {
     case invalidDataError
 }
 
-class ZIPFoundationTests: XCTestCase {
+@available(macOS 10.11, *)
+final class ZIPFoundationTests: XCTestCase {
     class var testBundle: Bundle {
         return Bundle(for: self)
     }
@@ -235,6 +236,7 @@ class ZIPFoundationTests: XCTestCase {
 
 }
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     // From https://oleb.net/blog/2017/03/keeping-xctest-in-sync/
     func testLinuxTestSuiteIncludesAllTests() {
@@ -311,9 +313,9 @@ extension ZIPFoundationTests {
             ("testLinuxTestSuiteIncludesAllTests", testLinuxTestSuiteIncludesAllTests)
         ] + darwinOnlyTests
     }
-
+    
     static var darwinOnlyTests: [(String, (ZIPFoundationTests) -> () throws -> Void)] {
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+        #if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS))
         return [
             ("testZipItemProgress", testZipItemProgress),
             ("testUnzipItemProgress", testUnzipItemProgress),
@@ -327,6 +329,7 @@ extension ZIPFoundationTests {
     }
 }
 
+@available(macOS 10.11, *)
 extension Archive {
     func checkIntegrity() -> Bool {
         var isCorrect = false

diff --git a/Tests/ZIPFoundationTests/ZIPFoundationWritingTests.swift b/Tests/ZIPFoundationTests/ZIPFoundationWritingTests.swift
@@ -11,6 +11,7 @@
 import XCTest
 @testable import ZIPFoundation
 
+@available(macOS 10.11, *)
 extension ZIPFoundationTests {
     func testCreateArchiveAddUncompressedEntry() {
         let archive = self.archive(for: #function, mode: .create)