Updates to Swift 5.x

ZebulonFrantzich · Oct 14, 2019 · d83b66e · d83b66e
1 parent d7d3747
commit d83b66e
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 4,429 deletions.
diff --git a/Haneke.xcodeproj/project.pbxproj b/Haneke.xcodeproj/project.pbxproj
diff --git a/Haneke.xcodeproj/xcshareddata/xcschemes/Haneke-iOS.xcscheme b/Haneke.xcodeproj/xcshareddata/xcschemes/Haneke-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -42,6 +42,15 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A095C9551980418C00CD0F4C"
+            BuildableName = "Haneke.framework"
+            BlueprintName = "Haneke-iOS"
+            ReferencedContainer = "container:Haneke.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -54,17 +63,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A095C9551980418C00CD0F4C"
-            BuildableName = "Haneke.framework"
-            BlueprintName = "Haneke-iOS"
-            ReferencedContainer = "container:Haneke.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
             ReferencedContainer = "container:Haneke.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Haneke.xcodeproj/xcshareddata/xcschemes/Haneke-tvOS.xcscheme b/Haneke.xcodeproj/xcshareddata/xcschemes/Haneke-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6393C5DA1C3B229200EB1FD8"
+            BuildableName = "Haneke.framework"
+            BlueprintName = "Haneke-tvOS"
+            ReferencedContainer = "container:Haneke.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6393C5DA1C3B229200EB1FD8"
-            BuildableName = "Haneke.framework"
-            BlueprintName = "Haneke-tvOS"
-            ReferencedContainer = "container:Haneke.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Haneke.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Haneke.xcodeproj/xcshareddata/xcschemes/HanekeDemo.xcscheme b/Haneke.xcodeproj/xcshareddata/xcschemes/HanekeDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A0026E9919C9BFBC004DE0C6"
+            BuildableName = "HanekeDemo.app"
+            BlueprintName = "HanekeDemo"
+            ReferencedContainer = "container:Haneke.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A0026E9919C9BFBC004DE0C6"
-            BuildableName = "HanekeDemo.app"
-            BlueprintName = "HanekeDemo"
-            ReferencedContainer = "container:Haneke.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
             ReferencedContainer = "container:Haneke.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Haneke/Cache.swift b/Haneke/Cache.swift
@@ -294,7 +294,7 @@ open class Cache<T: DataConvertible> where T.Result == T, T : DataRepresentable
     // Ideally we would put each of these in the respective fetcher file as a Cache extension. Unfortunately, this fails to link when using the framework in a project as of Xcode 6.1.
 
     open func fetch(key: String, value getValue : @autoclosure @escaping () -> T.Result, formatName: String = HanekeGlobals.Cache.OriginalFormatName, success succeed : Fetch<T>.Succeeder? = nil) -> Fetch<T> {
-        let fetcher = SimpleFetcher<T>(key: key, value: getValue)
+        let fetcher = SimpleFetcher<T>(key: key, value: getValue())
         return self.fetch(fetcher: fetcher, formatName: formatName, success: succeed)
     }
 

diff --git a/Haneke/CryptoSwiftMD5.swift b/Haneke/CryptoSwiftMD5.swift
@@ -36,8 +36,8 @@ func arrayOfBytes<T>(value:T, length:Int? = nil) -> [UInt8] {
         bytes[totalBytes - 1 - j] = (bytesPointer + j).pointee
     }
 
-    valuePointer.deinitialize()
-    valuePointer.deallocate(capacity: 1)
+    valuePointer.deinitialize(count: 1) //deinitialize()
+    valuePointer.deallocate()
 
     return bytes
 }

diff --git a/Haneke/Data.swift b/Haneke/Data.swift
@@ -40,7 +40,7 @@ extension UIImage : DataConvertible, DataRepresentable {
     }
 
     public func asData() -> Data! {
-        return self.hnk_data() as Data!
+        return self.hnk_data() as Data?
     }
 
     fileprivate static let scale = UIScreen.main.scale

diff --git a/Haneke/DiskCache.swift b/Haneke/DiskCache.swift
@@ -18,7 +18,7 @@ open class DiskCache {
         return basePath
     }
 
-    open let path: String
+    public let path: String
 
     open var size : UInt64 = 0
 

diff --git a/Haneke/Fetch.swift b/Haneke/Fetch.swift
@@ -84,6 +84,6 @@ open class Fetch<T> {
 }
 
 open class Wrapper<T> {
-    open let value: T
+    public let value: T
     public init(_ value: T) { self.value = value }
 }
diff --git a/Haneke/Fetcher.swift b/Haneke/Fetcher.swift
@@ -11,7 +11,7 @@ import UIKit
 // See: http://stackoverflow.com/questions/25915306/generic-closure-in-protocol
 open class Fetcher<T : DataConvertible> {
 
-    open let key: String
+    public let key: String
 
     public init(key: String) {
         self.key = key

diff --git a/Haneke/Log.swift b/Haneke/Log.swift
@@ -32,7 +32,7 @@ struct Log {
     }
 
     static func error(message: @autoclosure () -> String, error: Error? = nil) {
-        log(.Error, message, error)
+        log(.Error, message(), error)
     }
 
 }
diff --git a/Haneke/UIImageView+Haneke.swift b/Haneke/UIImageView+Haneke.swift
@@ -23,7 +23,7 @@ public extension UIImageView {
     }
 
     public func hnk_setImage( _ image: @autoclosure @escaping () -> UIImage, key: String, placeholder : UIImage? = nil, format : Format<UIImage>? = nil, success succeed : ((UIImage) -> ())? = nil) {
-        let fetcher = SimpleFetcher<UIImage>(key: key, value: image)
+        let fetcher = SimpleFetcher<UIImage>(key: key, value: image())
         self.hnk_setImage(fromFetcher: fetcher, placeholder: placeholder, format: format, success: succeed)
     }
 

diff --git a/HanekeTests/AsyncFetcher.swift b/HanekeTests/AsyncFetcher.swift
diff --git a/HanekeTests/CGSize+HanekeTests.swift b/HanekeTests/CGSize+HanekeTests.swift