thepeaklab · ergunkocak · Mar 30, 2020 · Mar 30, 2020 · Mar 30, 2020 · Apr 17, 2020
diff --git a/Cache.podspec b/Cache.podspec
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
 
   s.frameworks = 'Foundation'
 
-  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
 end
diff --git a/Cache.xcodeproj/project.pbxproj b/Cache.xcodeproj/project.pbxproj
@@ -667,7 +667,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = "Hyper Interaktiv AS";
 				TargetAttributes = {
 					BDEDD3551DBCE5B1007416A6 = {
@@ -700,6 +700,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = D5DC59D61C20593E003BD79B;
@@ -999,6 +1000,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
@@ -1024,6 +1026,7 @@
 				PRODUCT_NAME = Cache;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
@@ -1045,6 +1048,7 @@
 				SDKROOT = appletvos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
@@ -1063,6 +1067,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
@@ -1077,6 +1082,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-iOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1089,6 +1095,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-iOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1111,6 +1118,7 @@
 				PRODUCT_NAME = Cache;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1133,6 +1141,7 @@
 				PRODUCT_NAME = Cache;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1148,6 +1157,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-MacTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1163,13 +1173,15 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-MacTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 		D5DC59F21C20593E003BD79B /* Debug */ = {
 			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;
@@ -1229,6 +1241,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;
@@ -1294,6 +1307,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Cache;
 				PRODUCT_NAME = Cache;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1313,6 +1327,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Cache;
 				PRODUCT_NAME = Cache;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Cache.xcodeproj/xcshareddata/xcschemes/Cache-iOS.xcscheme b/Cache.xcodeproj/xcshareddata/xcschemes/Cache-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1130"
    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 = "D5DC59DF1C20593E003BD79B"
+            BuildableName = "Cache.framework"
+            BlueprintName = "Cache-iOS"
+            ReferencedContainer = "container:Cache.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -41,17 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D5DC59DF1C20593E003BD79B"
-            BuildableName = "Cache.framework"
-            BlueprintName = "Cache-iOS"
-            ReferencedContainer = "container:Cache.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:Cache.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Cache.xcodeproj/xcshareddata/xcschemes/Cache-macOS.xcscheme b/Cache.xcodeproj/xcshareddata/xcschemes/Cache-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1130"
    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 = "D5291D5F1C283B5300B702C9"
+            BuildableName = "Cache.framework"
+            BlueprintName = "Cache-Mac"
+            ReferencedContainer = "container:Cache.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -55,17 +64,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D5291D5F1C283B5300B702C9"
-            BuildableName = "Cache.framework"
-            BlueprintName = "Cache-Mac"
-            ReferencedContainer = "container:Cache.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -86,8 +84,6 @@
             ReferencedContainer = "container:Cache.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Cache.xcodeproj/xcshareddata/xcschemes/Cache-tvOS.xcscheme b/Cache.xcodeproj/xcshareddata/xcschemes/Cache-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1130"
    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 = "BDEDD3551DBCE5B1007416A6"
+            BuildableName = "Cache.framework"
+            BlueprintName = "Cache-tvOS"
+            ReferencedContainer = "container:Cache.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -41,17 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BDEDD3551DBCE5B1007416A6"
-            BuildableName = "Cache.framework"
-            BlueprintName = "Cache-tvOS"
-            ReferencedContainer = "container:Cache.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:Cache.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.1
 
 import PackageDescription
 
@@ -13,11 +13,12 @@ let package = Package(
     targets: [
         .target(
             name: "Cache",
-            path: "Source/Shared",
+            path: "Source",
             exclude: ["Library/ImageWrapper.swift"]), // relative to the target path
         .testTarget(
             name: "CacheTests",
             dependencies: ["Cache"],
             path: "Tests"),
-    ]
+    ],
+    swiftLanguageVersions: [.v5]
 )
diff --git a/Source/Mac/NSImage+Extensions.swift b/Source/Mac/NSImage+Extensions.swift
@@ -1,3 +1,4 @@
+#if canImport(AppKit)
 import AppKit
 
 /// Helper UIImage extension.
@@ -34,3 +35,5 @@ extension NSImage {
       .representation(using: imageFileType, properties: [:])
   }
 }
+
+#endif
diff --git a/Source/Shared/Configuration/MemoryConfig.swift b/Source/Shared/Configuration/MemoryConfig.swift
@@ -17,4 +17,5 @@ public struct MemoryConfig {
     self.countLimit = countLimit
     self.totalCostLimit = totalCostLimit
   }
+
 }
diff --git a/Source/Shared/Extensions/Date+Extensions.swift b/Source/Shared/Extensions/Date+Extensions.swift
@@ -9,4 +9,5 @@ extension Date {
   var inThePast: Bool {
     return timeIntervalSinceNow < 0
   }
+
 }
diff --git a/Source/Shared/Extensions/JSONDecoder+Extensions.swift b/Source/Shared/Extensions/JSONDecoder+Extensions.swift
@@ -39,4 +39,5 @@ public extension JSONDecoder {
   static func decode<T: Codable>(_ data: Data, to type: T.Type) throws -> T {
     return try JSONDecoder().decode(T.self, from: data)
   }
+
 }
diff --git a/Source/Shared/Library/ImageWrapper.swift b/Source/Shared/Library/ImageWrapper.swift
@@ -1,6 +1,7 @@
 import Foundation
 
 public struct ImageWrapper: Codable {
+
   public let image: Image
 
   public enum CodingKeys: String, CodingKey {
@@ -29,4 +30,5 @@ public struct ImageWrapper: Codable {
 
     try container.encode(data, forKey: CodingKeys.image)
   }
+
 }
diff --git a/Source/Shared/Library/TransformerFactory.swift b/Source/Shared/Library/TransformerFactory.swift
@@ -1,6 +1,7 @@
 import Foundation
 
 public class TransformerFactory {
+
   public static func forData() -> Transformer<Data> {
     let toData: (Data) throws -> Data = { $0 }
 
@@ -35,4 +36,5 @@ public class TransformerFactory {
 
     return Transformer<U>(toData: toData, fromData: fromData)
   }
+
 }
diff --git a/Source/iOS/UIImage+Extensions.swift b/Source/iOS/UIImage+Extensions.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 /// Helper UIImage extension.
@@ -22,14 +23,10 @@ extension UIImage {
 
   /// Convert to data
   func cache_toData() -> Data? {
-    #if swift(>=4.2)
     return hasAlpha
       ? pngData()
       : jpegData(compressionQuality: 1.0)
-    #else
-    return hasAlpha
-      ? UIImagePNGRepresentation(self)
-      : UIImageJPEGRepresentation(self, 1.0)
-    #endif
   }
 }
+
+#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,5 @@ public struct MemoryConfig { @@
         self.countLimit = countLimit
         self.totalCostLimit = totalCostLimit
       }
     }