Merge pull request #31 from folio-sec/swift-version

Swift 5 syntax

Author: kishikawakatsumi

Configurations/ImagePipeline.xcconfig

@@ -14,5 +14,5 @@ MODULEMAP_FILE = $(SRCROOT)/Sources/WebPDecoder/include/module.modulemap
 PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.$(PROJECT_NAME)
 PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
 SKIP_INSTALL = YES
-SWIFT_VERSION = 4.2
+SWIFT_VERSION = 5.0
 TARGETED_DEVICE_FAMILY = 1,2

Configurations/ImagePipelineTests.xcconfig

@@ -7,5 +7,5 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
 PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.$(TARGET_NAME)
 PRODUCT_NAME = $(TARGET_NAME)
-SWIFT_VERSION = 4.2
+SWIFT_VERSION = 5.0
 TARGETED_DEVICE_FAMILY = 1,2

ImagePipeline.xcodeproj/project.pbxproj

@@ -1560,10 +1560,11 @@
 				TargetAttributes = {
 					140C333D21D93BD3007BDE61 = {
 						CreatedOnToolsVersion = 10.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1130;
 					};
 					140C334621D93BD3007BDE61 = {
 						CreatedOnToolsVersion = 10.1;
+						LastSwiftMigration = 1130;
 					};
 				};
 			};
@@ -1573,6 +1574,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 140C333421D93BD3007BDE61;
 			productRefGroup = 140C333F21D93BD3007BDE61 /* Products */;

Sources/ImagePipeline/ImageDecoder.swift

@@ -23,7 +23,11 @@ public struct ImageDecoder: ImageDecoding {
             return nil
         }
 
-        return data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) in
+        return data.withUnsafeBytes { (buffer: UnsafeRawBufferPointer) in
+            guard let bytes = buffer.bindMemory(to: UInt8.self).baseAddress else {
+                return nil
+            }
+
             var width: Int32 = 0
             var height: Int32 = 0
 

Sources/ImagePipeline/Storage.swift

@@ -47,7 +47,7 @@ public class SQLiteStorage: Storage {
         do {
             try SQLite.execute { sqlite3_bind_text(statement, 1, url.absoluteString.cString(using: .utf8), -1, SQLITE_TRANSIENT) }
             try SQLite.execute { sqlite3_bind_text(statement, 2, entry.url.absoluteString.cString(using: .utf8), -1, SQLITE_TRANSIENT) }
-            try SQLite.execute { entry.data.withUnsafeBytes { sqlite3_bind_blob(statement, 3, $0, Int32(entry.data.count), SQLITE_TRANSIENT) } }
+            try SQLite.execute { entry.data.withUnsafeBytes { sqlite3_bind_blob(statement, 3, $0.baseAddress, Int32($0.count), SQLITE_TRANSIENT) } }
             if let contentType = entry.contentType {
                 try SQLite.execute { sqlite3_bind_text(statement, 4, contentType.cString(using: .utf8), -1, SQLITE_TRANSIENT) }
             }