Updated to Swift5 and fixed deprecation warnings.

Sergey A. Novitsky · Sergey A. Novitsky · commit 928029d0d9a9 · 2019-05-13T10:08:47.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # FFDataWrapper
 
+# Version 1.10
+- Swift version is changed to 5.
+- Xcode versions lower than 10.2 are no longer supported.
+- Fixed compiler deprecation warnings.
+
 ## Version 1.9
 - Changed the name of the framework/module on MacOS to avoid conflicts in the Xcode new build system.
 
diff --git a/FFDataWrapper.podspec b/FFDataWrapper.podspec
@@ -1,17 +1,18 @@
 Pod::Spec.new do |spec|
     spec.name         = 'FFDataWrapper'
-    spec.version      = '1.9'
+    spec.version      = '1.10'
     spec.ios.deployment_target = "9.3"
 	spec.osx.deployment_target = "10.10"
     spec.license      = { :type => 'MIT', :file => 'LICENSE' }
     spec.summary      = 'Wrapper for data or string objects with custom internal storage'
     spec.homepage     = 'https://github.com/flockoffiles/FFDataWrapper'
     spec.author       = 'Sergey Novitsky'
-    spec.source       = { :git => 'https://github.com/flockoffiles/FFDataWrapper.git', :tag => 'v' + String(spec.version) }
+    # spec.source       = { :git => 'https://github.com/flockoffiles/FFDataWrapper.git', :tag => 'v' + String(spec.version) }
+    spec.source       = { :git => 'https://github.com/flockoffiles/FFDataWrapper.git', :branch => 'swift5' }
     spec.source_files = 'FFDataWrapper/*.swift',
 	spec.public_header_files = 'FFDataWrapper/*.h'
     spec.documentation_url = 'https://github.com/flockoffiles/FFDataWrapper/'
-	spec.swift_version = '4.2'
+	spec.swift_version = '5.0'
     # spec.dependency '', '~> 0.0.0'
     spec.preserve_paths = 'README.md', 'FFDataWrapperTests/*.swift'
-end
+end
diff --git a/FFDataWrapper.xcodeproj/project.pbxproj b/FFDataWrapper.xcodeproj/project.pbxproj
@@ -56,6 +56,7 @@
 		572AF0B120371C230094DA85 /* FFDataWrapperMacOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FFDataWrapperMacOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		572AF0B320371C230094DA85 /* FFDataWrapperMacOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FFDataWrapperMacOS.h; sourceTree = "<group>"; };
 		572AF0B420371C230094DA85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		5742D3A922895D20003EF87A /* FFDataWrapper.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = FFDataWrapper.podspec; sourceTree = "<group>"; };
 		5766C516221BFB130063EA80 /* FFDataWrapper+Mapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FFDataWrapper+Mapping.swift"; sourceTree = "<group>"; };
 		5766C518221C05F70063EA80 /* FFDataWrapper+InitializationWithInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FFDataWrapper+InitializationWithInfo.swift"; sourceTree = "<group>"; };
 		57896109221B17E9001373CE /* FFDataWrapper+String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FFDataWrapper+String.swift"; sourceTree = "<group>"; };
@@ -117,6 +118,7 @@
 		A5063F791F73B29500CA4109 = {
 			isa = PBXGroup;
 			children = (
+				5742D3A922895D20003EF87A /* FFDataWrapper.podspec */,
 				570121B322579DB8001212E7 /* README.md */,
 				570121B422579DCC001212E7 /* CHANGELOG.md */,
 				A5063F851F73B29500CA4109 /* FFDataWrapper */,
@@ -257,7 +259,7 @@
 				TargetAttributes = {
 					572AF0B020371C230094DA85 = {
 						CreatedOnToolsVersion = 9.2;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					A5063F821F73B29500CA4109 = {
@@ -397,7 +399,6 @@
 				PRODUCT_NAME = FFDataWrapperMacOS;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -422,7 +423,6 @@
 				PRODUCT_NAME = FFDataWrapperMacOS;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -483,7 +483,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -538,7 +538,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -564,7 +564,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -587,7 +586,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.flockoffiles.FFDataWrapper;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -602,7 +600,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.flockoffiles.FFDataWrapperTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -617,7 +614,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.flockoffiles.FFDataWrapperTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/FFDataWrapper/FFDataWrapper+Data.swift b/FFDataWrapper/FFDataWrapper+Data.swift
@@ -25,9 +25,9 @@ public extension FFDataWrapper {
         
         if (data.count > 0) {
             // Encode the data
-            data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) -> Void in
+            data.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) -> Void in
                 let initialEncoder = encode ? unwrappedCoders.encoder : FFDataWrapperEncoders.identity.coders.encoder
-                initialEncoder(UnsafeBufferPointer(start: bytes, count: data.count),
+                initialEncoder(UnsafeBufferPointer(start: bytes.baseAddress!.assumingMemoryBound(to: UInt8.self), count: data.count),
                                UnsafeMutableBufferPointer(start: self.dataRef.dataBuffer.baseAddress!, count: self.dataRef.dataBuffer.count))
             }
         }
@@ -58,9 +58,9 @@ public extension FFDataWrapper {
         
         if (data.count > 0) {
             // Encode the data
-            data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) in
+            data.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) in
                 let initialEncoder = encode ? unwrappedCoders.encoder : FFDataWrapperEncoders.infoIdentityFunction()
-                initialEncoder(UnsafeBufferPointer(start: bytes, count: data.count),
+                initialEncoder(UnsafeBufferPointer(start: bytes.baseAddress!.assumingMemoryBound(to: UInt8.self), count: data.count),
                                UnsafeMutableBufferPointer(start: self.dataRef.dataBuffer.baseAddress!, count: self.dataRef.dataBuffer.count),
                                info)
             }
diff --git a/FFDataWrapper/FFDataWrapper+Initialization.swift b/FFDataWrapper/FFDataWrapper+Initialization.swift
@@ -112,7 +112,7 @@ extension FFDataWrapper {
                 encode: Bool = true,
                 initializer: (UnsafeMutableBufferPointer<UInt8>) -> Void) {
         let coders: FFDataWrapper.Coders? = FFDataWrapper.Coders(coder, coder)
-        try! self.init(length: length, coders: coders, encode: encode, initializer: initializer)
+        self.init(length: length, coders: coders, encode: encode, initializer: initializer)
     }
 
     /// Create a wrapper with the given maximum capacity (in bytes).
@@ -176,7 +176,7 @@ extension FFDataWrapper {
                 encode: Bool = true,
                 initializer: (UnsafeMutableBufferPointer<UInt8>, UnsafeMutablePointer<Int>) -> Void) {
         let coders = FFDataWrapper.Coders(coder, coder)
-        try! self.init(capacity: capacity, coders: coders, encode: encode, initializer: initializer)
+        self.init(capacity: capacity, coders: coders, encode: encode, initializer: initializer)
     }
 
 }
diff --git a/FFDataWrapper/FFDataWrapper+InitializationWithInfo.swift b/FFDataWrapper/FFDataWrapper+InitializationWithInfo.swift
@@ -101,7 +101,7 @@ extension FFDataWrapper {
                 encode: Bool = true,
                 initializer: (UnsafeMutableBufferPointer<UInt8>) -> Void) {
         let coders: FFDataWrapper.InfoCoders? = FFDataWrapper.InfoCoders(infoCoder, infoCoder)
-        try! self.init(length: length, infoCoders: coders, info: info, encode: encode, initializer: initializer)
+        self.init(length: length, infoCoders: coders, info: info, encode: encode, initializer: initializer)
     }
 
     /// Create a wrapper with the given maximum capacity (in bytes).
@@ -169,6 +169,6 @@ extension FFDataWrapper {
                 encode: Bool = true,
                 initializer: (UnsafeMutableBufferPointer<UInt8>, UnsafeMutablePointer<Int>) -> Void) {
         let coders = FFDataWrapper.InfoCoders(infoCoder, infoCoder)
-        try! self.init(capacity: capacity, infoCoders: coders, encode: encode, initializer: initializer)
+        self.init(capacity: capacity, infoCoders: coders, encode: encode, initializer: initializer)
     }
 }
diff --git a/FFDataWrapper/FFDataWrapper+Mapping.swift b/FFDataWrapper/FFDataWrapper+Mapping.swift
@@ -19,15 +19,17 @@ extension FFDataWrapper {
     public func mapData<ResultType>(_ block: (inout Data) throws -> ResultType) rethrows -> ResultType {
         var decodedData = Data(repeating:0, count: dataRef.dataBuffer.count)
         
-        let count = decodedData.withUnsafeMutableBytes({ (destPtr: UnsafeMutablePointer<UInt8>) -> Int in
+        let count = decodedData.withUnsafeMutableBytes({ (destMutableRawBufferPtr: UnsafeMutableRawBufferPointer) -> Int in
             switch self.storedCoders {
             case .coders(_, let decoder):
                 decoder(UnsafeBufferPointer(start: self.dataRef.dataBuffer.baseAddress!, count: dataRef.dataBuffer.count),
-                        UnsafeMutableBufferPointer(start: destPtr, count: dataRef.dataBuffer.count))
+                        UnsafeMutableBufferPointer(start: destMutableRawBufferPtr.baseAddress!.assumingMemoryBound(to: UInt8.self),
+                                                   count: dataRef.dataBuffer.count))
                 return dataRef.dataBuffer.count
             case .infoCoders(_, let decoder):
                 decoder(UnsafeBufferPointer(start: self.dataRef.dataBuffer.baseAddress!, count: dataRef.dataBuffer.count),
-                        UnsafeMutableBufferPointer(start: destPtr, count: dataRef.dataBuffer.count), nil)
+                        UnsafeMutableBufferPointer(start: destMutableRawBufferPtr.baseAddress!.assumingMemoryBound(to: UInt8.self),
+                                                   count: dataRef.dataBuffer.count), nil)
                 return dataRef.dataBuffer.count
             }
             
@@ -54,14 +56,16 @@ extension FFDataWrapper {
     public func mapData<ResultType>(info: Any?, block: (inout Data) throws -> ResultType) rethrows -> ResultType {
         var decodedData = Data(repeating:0, count: dataRef.dataBuffer.count)
         
-        decodedData.withUnsafeMutableBytes({ (destPtr: UnsafeMutablePointer<UInt8>) -> Void in
+        decodedData.withUnsafeMutableBytes({ (destMutableRawBufferPtr: UnsafeMutableRawBufferPointer) -> Void in
             switch self.storedCoders {
             case .coders(_, let decoder):
                 decoder(UnsafeBufferPointer(start: self.dataRef.dataBuffer.baseAddress!, count: dataRef.dataBuffer.count),
-                        UnsafeMutableBufferPointer(start: destPtr, count: dataRef.dataBuffer.count))
+                        UnsafeMutableBufferPointer(start: destMutableRawBufferPtr.baseAddress!.assumingMemoryBound(to: UInt8.self),
+                                                   count: dataRef.dataBuffer.count))
             case .infoCoders(_, let decoder):
                 decoder(UnsafeBufferPointer(start: self.dataRef.dataBuffer.baseAddress!, count: dataRef.dataBuffer.count),
-                        UnsafeMutableBufferPointer(start: destPtr, count: dataRef.dataBuffer.count), info)
+                        UnsafeMutableBufferPointer(start: destMutableRawBufferPtr.baseAddress!.assumingMemoryBound(to: UInt8.self),
+                                                   count: dataRef.dataBuffer.count), info)
             }
         })
         let result = try block(&decodedData)
diff --git a/FFDataWrapper/FFDataWrapperEncoders.swift b/FFDataWrapper/FFDataWrapperEncoders.swift
@@ -24,7 +24,7 @@ public enum FFDataWrapperEncoders {
         case .xorWithRandomVectorOfLength(let length):
             var vector = Data(count: length)
             let _ = vector.withUnsafeMutableBytes {
-                SecRandomCopyBytes(kSecRandomDefault, length, $0)
+                return SecRandomCopyBytes(kSecRandomDefault, $0.count, $0.baseAddress!)
             }
             
             return (encoder: FFDataWrapperEncoders.xorWithVector(vector), decoder: FFDataWrapperEncoders.xorWithVector(vector))
@@ -40,7 +40,7 @@ public enum FFDataWrapperEncoders {
         case .xorWithRandomVectorOfLength(let length):
             var vector = Data(count: length)
             let _ = vector.withUnsafeMutableBytes {
-                SecRandomCopyBytes(kSecRandomDefault, length, $0)
+                return SecRandomCopyBytes(kSecRandomDefault, $0.count, $0.baseAddress!)
             }
             
             return (encoder: FFDataWrapperEncoders.infoXorWithVector(vector), decoder: FFDataWrapperEncoders.infoXorWithVector(vector))
@@ -124,7 +124,7 @@ public extension FFDataWrapperEncoders {
 
 public extension Array where Element == UInt8 {
     func coders(_ coder: (Data) -> FFDataWrapper.Coder) -> (FFDataWrapper.Coder, FFDataWrapper.Coder) {
-        let data = Data(bytes: self)
+        let data = Data(self)
         return (coder(data), coder(data))
     }
 }
diff --git a/FFDataWrapper/Info.plist b/FFDataWrapper/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9</string>
+	<string>1.10</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/FFDataWrapperMacOS/Info.plist b/FFDataWrapperMacOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9</string>
+	<string>1.10</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/FFDataWrapperTests/FFDataWrapperTests.swift b/FFDataWrapperTests/FFDataWrapperTests.swift
@@ -122,9 +122,9 @@ class FFDataWrapperTests: XCTestCase
         var copiedBacking = Data()
         
         let bytes: UnsafePointer<UInt8> = dataWrapper.mapData({ (data: inout Data) -> UnsafePointer<UInt8> in
-            return data.withUnsafeBytes({ (ptr: UnsafePointer<UInt8>) -> UnsafePointer<UInt8> in
-                copiedBacking = Data(bytes: ptr, count: data.count)
-                return ptr
+            return data.withUnsafeBytes({ (ptr: UnsafeRawBufferPointer) -> UnsafePointer<UInt8> in
+                copiedBacking = Data(bytes: ptr.baseAddress!.assumingMemoryBound(to: UInt8.self), count: data.count)
+                return ptr.baseAddress!.assumingMemoryBound(to: UInt8.self)
             })
         })
         

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ extension FFDataWrapper {`
`112`	`112`	`encode: Bool = true,`
`113`	`113`	`initializer: (UnsafeMutableBufferPointer<UInt8>) -> Void) {`
`114`	`114`	`let coders: FFDataWrapper.Coders? = FFDataWrapper.Coders(coder, coder)`
`115`		`- try! self.init(length: length, coders: coders, encode: encode, initializer: initializer)`
	`115`	`+ self.init(length: length, coders: coders, encode: encode, initializer: initializer)`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/// Create a wrapper with the given maximum capacity (in bytes).`
`@@ -176,7 +176,7 @@ extension FFDataWrapper {`
`176`	`176`	`encode: Bool = true,`
`177`	`177`	`initializer: (UnsafeMutableBufferPointer<UInt8>, UnsafeMutablePointer<Int>) -> Void) {`
`178`	`178`	`let coders = FFDataWrapper.Coders(coder, coder)`
`179`		`- try! self.init(capacity: capacity, coders: coders, encode: encode, initializer: initializer)`
	`179`	`+ self.init(capacity: capacity, coders: coders, encode: encode, initializer: initializer)`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ extension FFDataWrapper {`
`101`	`101`	`encode: Bool = true,`
`102`	`102`	`initializer: (UnsafeMutableBufferPointer<UInt8>) -> Void) {`
`103`	`103`	`let coders: FFDataWrapper.InfoCoders? = FFDataWrapper.InfoCoders(infoCoder, infoCoder)`
`104`		`- try! self.init(length: length, infoCoders: coders, info: info, encode: encode, initializer: initializer)`
	`104`	`+ self.init(length: length, infoCoders: coders, info: info, encode: encode, initializer: initializer)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/// Create a wrapper with the given maximum capacity (in bytes).`
`@@ -169,6 +169,6 @@ extension FFDataWrapper {`
`169`	`169`	`encode: Bool = true,`
`170`	`170`	`initializer: (UnsafeMutableBufferPointer<UInt8>, UnsafeMutablePointer<Int>) -> Void) {`
`171`	`171`	`let coders = FFDataWrapper.InfoCoders(infoCoder, infoCoder)`
`172`		`- try! self.init(capacity: capacity, infoCoders: coders, encode: encode, initializer: initializer)`
	`172`	`+ self.init(capacity: capacity, infoCoders: coders, encode: encode, initializer: initializer)`
`173`	`173`	`}`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public enum FFDataWrapperEncoders {`
`24`	`24`	`case .xorWithRandomVectorOfLength(let length):`
`25`	`25`	`var vector = Data(count: length)`
`26`	`26`	`let _ = vector.withUnsafeMutableBytes {`
`27`		`- SecRandomCopyBytes(kSecRandomDefault, length, $0)`
	`27`	`+ return SecRandomCopyBytes(kSecRandomDefault, $0.count, $0.baseAddress!)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`return (encoder: FFDataWrapperEncoders.xorWithVector(vector), decoder: FFDataWrapperEncoders.xorWithVector(vector))`
`@@ -40,7 +40,7 @@ public enum FFDataWrapperEncoders {`
`40`	`40`	`case .xorWithRandomVectorOfLength(let length):`
`41`	`41`	`var vector = Data(count: length)`
`42`	`42`	`let _ = vector.withUnsafeMutableBytes {`
`43`		`- SecRandomCopyBytes(kSecRandomDefault, length, $0)`
	`43`	`+ return SecRandomCopyBytes(kSecRandomDefault, $0.count, $0.baseAddress!)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return (encoder: FFDataWrapperEncoders.infoXorWithVector(vector), decoder: FFDataWrapperEncoders.infoXorWithVector(vector))`
`@@ -124,7 +124,7 @@ public extension FFDataWrapperEncoders {`
`124`	`124`
`125`	`125`	`public extension Array where Element == UInt8 {`
`126`	`126`	`func coders(_ coder: (Data) -> FFDataWrapper.Coder) -> (FFDataWrapper.Coder, FFDataWrapper.Coder) {`
`127`		`- let data = Data(bytes: self)`
	`127`	`+ let data = Data(self)`
`128`	`128`	`return (coder(data), coder(data))`
`129`	`129`	`}`
`130`	`130`	`}`