Deprecated Swift 4

Author: colemancda

Xcode/TLVCoding.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -1,42 +1,29 @@
 language: generic
 matrix:
    include:
-      # Test Ubuntu Linux 14.04 / Swift 4.1.2
+      # Test Ubuntu Linux 16.04 / Swift 5
        - os: linux
-         dist: trusty
+         dist: xenial
          sudo: required
-      # Test Xcode 9.3 / Swift 4.1.0
-       - os: osx
-         osx_image: xcode9.3
-      # Test Xcode 9.4.1 / Swift 4.1.2
-       - os: osx
-         osx_image: xcode9.4
-      # Test Xcode 10 / Swift 4.2
-       - os: osx
-         osx_image: xcode10
+         env:
+           - SWIFT_VERSION=swift-5.0-RELEASE
+           - SWIFT_URL=https://swift.org/builds/swift-5.0-release/ubuntu1604/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu16.04.tar.gz
+         install:
+           - export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu16.04/usr/bin:"${PATH}"
       # Test Xcode 10.2 / Swift 5
        - os: osx
          osx_image: xcode10.2
-
 addons:
   apt:
     packages:
     - clang
     - pkg-config
-install:
-  # Install Swift 4.1.2 on Ubuntu Linux 14.04
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir $SWIFT_DIR ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/swift-4.1.2-release/ubuntu1404/swift-4.1.2-RELEASE/swift-4.1.2-RELEASE-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
+script:
+  # Setup Linux environment
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang ; fi
-env:
-  - SWIFT_VERSION=swift-4.1.2-RELEASE
-script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu14.04/usr/bin:"${PATH}" ; fi
-  # Compile with SPM
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir $SWIFT_DIR ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl $SWIFT_URL -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
+  # Run Unit Tests
   - swift test
-  # Compile with Xcode
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd Xcode ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild clean test -scheme TLVCoding-macOS ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild clean build -scheme TLVCoding-iOS ; fi

.travis.yml

@@ -40,7 +40,6 @@ public extension TLVCodingKey where Self: RawRepresentable, Self.RawValue == TLV
     }
 }
 
-#if swift(>=4.2)
 public extension TLVCodingKey where Self: CaseIterable, Self: RawRepresentable, Self.RawValue == TLVTypeCode.RawValue {
 
     init?(stringValue: String) {
@@ -51,7 +50,6 @@ public extension TLVCodingKey where Self: CaseIterable, Self: RawRepresentable,
         self = value
     }
 }
-#endif
 
 internal extension TLVTypeCode {
 
@@ -98,21 +96,11 @@ internal extension CodingKey {
     static var sanitizedName: String {
 
         let rawName = String(reflecting: self)
-        #if swift(>=5.0)
         var elements = rawName.split(separator: ".")
-        #else
-        var elements = rawName.components(separatedBy: ".")
-        #endif
         guard elements.count > 2
             else { return rawName }
         elements.removeFirst()
-        #if swift(>=5.0)
         elements.removeAll { $0.contains("(unknown context") }
-        #else
-        while let index = elements.index(where: { $0.contains("(unknown context") }) {
-            elements.remove(at: index)
-        }
-        #endif
         return elements.reduce("", { $0 + ($0.isEmpty ? "" : ".") + $1 })
     }
 }

[email protected]

@@ -10,73 +10,38 @@ import Foundation
 
 internal extension Data {
 
-    #if swift(>=5.0) || (swift(>=4.2) && XCODE)
     func subdataNoCopy(in range: Range<Int>) -> Data {
 
         // stored in heap, can reuse buffer
         if count > Data.inlineBufferSize {
 
-            #if swift(>=5.0)
             return withUnsafeBytes { (buffer: UnsafeRawBufferPointer) in
                 Data(bytesNoCopy: UnsafeMutableRawPointer(mutating: buffer.baseAddress!.advanced(by: range.lowerBound)),
                      count: range.count,
                      deallocator: .none)
             }
-            #else
-            return withUnsafeBytes {
-                Data(bytesNoCopy: UnsafeMutableRawPointer(mutating: $0.advanced(by: range.lowerBound)),
-                     count: range.count,
-                     deallocator: .none)
-            }
-            #endif
 
         } else {
 
             // stored in stack, must copy
             return subdata(in: range)
         }
     }
-    #elseif swift(>=4.2)
-    func subdataNoCopy(in range: Range<Int>) -> Data {
-        
-        return withUnsafeBytes {
-            Data(bytesNoCopy: UnsafeMutableRawPointer(mutating: $0.advanced(by: range.lowerBound)),
-                 count: range.count,
-                 deallocator: .none)
-        }
-    }
-    #elseif swift(>=4.0)
-    func subdataNoCopy(in range: CountableRange<Int>) -> Data {
-        
-        let pointer = withUnsafeBytes { UnsafeMutableRawPointer(mutating: $0).advanced(by: range.lowerBound) }
-        return Data(bytesNoCopy: pointer, count: range.count, deallocator: .none)
-    }
-    
-    /// Returns a new copy of the data in a specified range.
-    func subdata(in range: CountableRange<Int>) -> Data {
-        return Data(self[range])
-    }
-    #endif
 
     func suffixNoCopy(from index: Int) -> Data {
-        
         return subdataNoCopy(in: index ..< count)
     }
 
     func suffixCheckingBounds(from start: Int) -> Data {
 
         if count > start {
-            
             return Data(suffix(from: start))
-            
         } else {
-            
             return Data()
         }
     }
 }
 
-#if swift(>=5.0) || (swift(>=4.2) && XCODE)
 private extension Data {
 
     /// Size of the inline buffer for `Foundation.Data` used in Swift 5.
@@ -97,4 +62,3 @@ private extension Data {
         return MemoryLayout<Buffer>.size
     }
 }
-#endif

[email protected]

@@ -48,20 +48,12 @@ extension UnsafeDataConvertible {
 
     /// Append data representation into buffer.
     static func += <T: DataContainer> (data: inout T, value: Self) {
-        #if swift(>=4.2)
-        withUnsafePointer(to: value) {
-            $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout<Self>.size) {
-                data.append($0, count: MemoryLayout<Self>.size)
-            }
-        }
-        #else
         var value = value
         withUnsafePointer(to: &value) {
             $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout<Self>.size) {
                 data.append($0, count: MemoryLayout<Self>.size)
             }
         }
-        #endif
     }
 }
 
@@ -85,35 +77,21 @@ internal protocol DataContainer: RandomAccessCollection where Self.Index == Int
 
     mutating func append <C: Collection> (contentsOf bytes: C) where C.Element == UInt8
 
-    #if swift(>=4.2)
     static func += (lhs: inout Self, rhs: UInt8)
+    
     static func += <C: Collection> (lhs: inout Self, rhs: C) where C.Element == UInt8
-    #endif
 }
 
 extension DataContainer {
 
-    #if swift(>=4.2)
-    #else
-    static func += (lhs: inout Self, rhs: UInt8) {
-        lhs.append(rhs)
-    }
-    
-    static func += <C: Collection> (lhs: inout Self, rhs: C) where C.Element == UInt8 {
-        lhs.append(contentsOf: rhs)
-    }
-    #endif
-    
     mutating func append <T: DataConvertible> (_ value: T) {
         self += value
     }
 }
 
 extension Data: DataContainer {
 
-    #if swift(>=4.2)
     static func += (lhs: inout Data, rhs: UInt8) {
         lhs.append(rhs)
     }
-    #endif
 }

Sources/CodingKey.swift

@@ -594,12 +594,7 @@ private extension TLVEncodable {
 
     var copyingBytes: Data {
 
-        #if swift(>=5)
         return withUnsafePointer(to: self, { Data(bytes: $0, count: MemoryLayout<Self>.size) })
-        #else
-        var copy = self
-        return withUnsafePointer(to: &copy, { Data(bytes: $0, count: MemoryLayout<Self>.size) })
-        #endif
     }
 }
 

Sources/Data.swift

@@ -296,22 +296,6 @@ extension ProvisioningState.CodingKeys {
     }
 }
 
-#if swift(>=4.2)
-#else
-extension ProvisioningState.CodingKeys {
-    
-    static let allCases: Set<ProvisioningState.CodingKeys> = [.state, .result]
-    
-    init?(stringValue: String) {
-        
-        guard let value = type(of: self).allCases.first(where: { $0.stringValue == stringValue })
-            else { return nil }
-        
-        self = value
-    }
-}
-#endif
-
 public struct Profile: Codable, Equatable {
 
     public var person: Person
@@ -420,11 +404,6 @@ public extension DeviceInformation {
         case bluetooth  = 0b001
         case camera     = 0b010
         case gps        = 0b100
-        
-        #if swift(>=4.2)
-        #else
-        public static let allCases: Set<DeviceInformation.Feature> = [.bluetooth, .camera, .gps]
-        #endif
     }
 }
 
@@ -607,25 +586,6 @@ extension CustomEncodableArray: Codable {
     }
 }
 
-
-#if swift(>=4.2)
-#else
-/// A type that provides a collection of all of its values.
-///
-/// Types that conform to the `CaseIterable` protocol are typically
-/// enumerations without associated values. When using a `CaseIterable` type,
-/// you can access a collection of all of the type's cases by using the type's
-/// `allCases` property.
-public protocol CaseIterable {
-    
-    /// A type that can represent a collection of all values of this type.
-    associatedtype AllCases: Collection where Self.AllCases.Element == Self
-    
-    /// A collection of all values of this type.
-    static var allCases: Self.AllCases { get }
-}
-#endif
-
 /// Enum that represents a bit mask flag / option.
 ///
 /// Basically `Swift.OptionSet` for enums.
@@ -763,15 +723,9 @@ extension BitMaskOptionSet: CustomStringConvertible {
 
 extension BitMaskOptionSet: Hashable {
 
-    #if swift(>=4.2)
     public func hash(into hasher: inout Hasher) {
         rawValue.hash(into: &hasher)
     }
-    #else
-    public var hashValue: Int {
-        return rawValue.hashValue
-    }
-    #endif
 }
 
 extension BitMaskOptionSet: ExpressibleByArrayLiteral {