Add Swift 5 support

kylehickinson · Aug 28, 2019 · be6953d · be6953d
1 parent d6a1b68
commit be6953d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/FastImage.xcodeproj/project.pbxproj b/FastImage.xcodeproj/project.pbxproj
@@ -194,26 +194,27 @@
 		A1B48FC21A0DD89F001BB364 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Kyle Hickinson";
 				TargetAttributes = {
 					27CF938D223352940093543E = {
 						CreatedOnToolsVersion = 10.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					A1B48FD41A0DD89F001BB364 = {
 						CreatedOnToolsVersion = 6.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = A1B48FC51A0DD89F001BB364 /* Build configuration list for PBXProject "FastImage" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = A1B48FC11A0DD89F001BB364;
 			productRefGroup = A1B48FCB1A0DD89F001BB364 /* Products */;
@@ -317,7 +318,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -364,7 +365,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -375,6 +376,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -427,6 +429,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -482,7 +485,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kylehickinson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -494,7 +497,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kylehickinson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/FastImage.xcodeproj/xcshareddata/xcschemes/FastImage.xcscheme b/FastImage.xcodeproj/xcshareddata/xcschemes/FastImage.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FastImage.xcodeproj/xcshareddata/xcschemes/FastImageTests.xcscheme b/FastImage.xcodeproj/xcshareddata/xcschemes/FastImageTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FastImage/DataExtensions.swift b/FastImage/DataExtensions.swift
@@ -21,15 +21,13 @@ extension Data {
   }
   func read<ResultType>(_ range: Range<Data.Index>) throws -> ResultType {
     if range.upperBound <= count {
-      return subdata(in: range).withUnsafeBytes({ $0.pointee })
+      return subdata(in: range).withUnsafeBytes { $0.load(as: ResultType.self) }
     }
     throw AccessError(range: range, data: self)
   }
   func readBytes(_ range: Range<Data.Index>) throws -> [UInt8] {
     if range.upperBound <= count {
-      return subdata(in: range).withUnsafeBytes { bytes in
-        Array(UnsafeBufferPointer(start: bytes, count: range.count / MemoryLayout<UInt8>.stride))
-      }
+      return subdata(in: range).withUnsafeBytes { [UInt8]($0) }
     }
     throw AccessError(range: range, data: self)
   }

diff --git a/FastImage/Size Decoders/JPGSizeDecoder.swift b/FastImage/Size Decoders/JPGSizeDecoder.swift
@@ -72,7 +72,11 @@ final class JPGSizeDecoder: ImageSizeDecoder {
           if exifString == "Exif" {
             let exifData = data.advanced(by: offset + 8)
             if let exif = try? Exif(data: exifData), imageOrientation == nil {
+              #if swift(>=5.0)
+              imageOrientation = exif.orientation
+              #else
               imageOrientation = exif?.orientation
+              #endif
             }
           }
           offset += Int(exifLength)