Updated to Swift 4.2

nvzqz · Sep 18, 2018 · 71188fb · 71188fb
1 parent e2f4578
commit 71188fb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/FileKit.xcodeproj/project.pbxproj b/FileKit.xcodeproj/project.pbxproj
@@ -504,7 +504,7 @@
 					};
 					5204B8571B96B85E00AA473F = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 					};
 					5263A9031B96BA3D00635A93 = {
 						CreatedOnToolsVersion = 7.0;
@@ -942,7 +942,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -963,7 +963,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -982,7 +982,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1003,7 +1003,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1018,7 +1018,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nikolaivazquez.FileKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1032,7 +1032,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1051,7 +1051,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -1073,7 +1073,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 				VALIDATE_PRODUCT = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1095,7 +1095,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1117,7 +1117,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;

diff --git a/FileKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/FileKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Sources/DispatchWatcher.swift b/Sources/DispatchWatcher.swift
@@ -87,10 +87,10 @@ open class DispatchFileSystemWatcher {
     // MARK: - Properties
 
     /// The paths being watched.
-    open let path: Path
+    public let path: Path
 
     /// The events used to create the watcher.
-    open let events: DispatchFileSystemEvents
+    public let events: DispatchFileSystemEvents
 
     /// The delegate to call when events happen
     weak var delegate: DispatchFileSystemWatcherDelegate?

diff --git a/Sources/Image+FileKit.swift b/Sources/Image+FileKit.swift
@@ -63,7 +63,7 @@ extension Image: ReadableWritable, WritableConvertible {
         #if os(OSX)
         return self.tiffRepresentation ?? Data()
         #else
-        return UIImagePNGRepresentation(self) ?? Data()
+        return self.pngData() ?? Data()
         #endif
     }
 

diff --git a/Sources/TextFile.swift b/Sources/TextFile.swift
@@ -119,7 +119,7 @@ extension TextFile {
 open class TextFileStream {
 
     /// The text encoding.
-    open let encoding: String.Encoding
+    public let encoding: String.Encoding
 
     let delimData: Data
     var fileHandle: FileHandle?
@@ -167,7 +167,7 @@ open class TextFileStream {
 open class TextFileStreamReader: TextFileStream {
 
     /// The chunk size when reading.
-    open let chunkSize: Int
+    public let chunkSize: Int
 
     /// Tells if the position is at the end of file.
     open var atEOF: Bool = false