Update project and dependencies

hyperoslo · Oct 4, 2020 · c7be321 · c7be321
1 parent bc3e2f9
commit c7be321
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 54 deletions.
diff --git a/Imaginary.xcodeproj/project.pbxproj b/Imaginary.xcodeproj/project.pbxproj
@@ -474,7 +474,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 1030;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Hyper Interaktiv AS";
 				TargetAttributes = {
 					BDE8FBE81D1BFB9F00C5A212 = {
@@ -692,7 +692,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Imaginary-Mac";
 				PRODUCT_NAME = Imaginary;
 				SDKROOT = macosx;
@@ -720,7 +720,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Imaginary-Mac";
 				PRODUCT_NAME = Imaginary;
 				SDKROOT = macosx;
@@ -822,7 +822,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Debug;
 		};
@@ -849,7 +849,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Release;
 		};
@@ -868,7 +868,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "ImaginaryTests-iOS/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -898,7 +898,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "ImaginaryTests-iOS/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -935,6 +935,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -960,7 +961,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -995,6 +996,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1014,7 +1016,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -1038,7 +1040,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Imaginary/iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1047,7 +1049,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Imaginary;
 				PRODUCT_NAME = Imaginary;
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -1062,7 +1066,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Imaginary/iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1071,7 +1075,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Imaginary;
 				PRODUCT_NAME = Imaginary;
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

diff --git a/Imaginary.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Imaginary.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,7 +6,7 @@
         "repositoryURL": "https://github.com/hyperoslo/Cache.git",
         "state": {
           "branch": "master",
-          "revision": "042b2cd22d3c8c30fdcead0c613de94a1d648123",
+          "revision": "c7f4d633049c3bd649a353bad36f6c17e9df085f",
           "version": null
         }
       }

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

diff --git a/Imaginary.xcodeproj/xcshareddata/xcschemes/Imaginary-macOS.xcscheme b/Imaginary.xcodeproj/xcshareddata/xcschemes/Imaginary-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Imaginary.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

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

diff --git a/ImaginaryTests-iOS/ImageFetcherTests.swift b/ImaginaryTests-iOS/ImageFetcherTests.swift
@@ -3,15 +3,15 @@ import Cache
 @testable import Imaginary
 
 private final class ImageFetcherTests: XCTestCase {
-  var storage: Storage<Image>!
+  var storage: Storage<String, Image>!
   var fetcher: ImageFetcher!
   fileprivate var mockDownloader = MockDownloader(modifyRequest: { $0 })
   let url = URL(string: "https://no.hyper/imaginary.png")!
 
   override func setUp() {
     super.setUp()
 
-    storage = try! Storage<Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
+    storage = try! Storage<String, Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
     fetcher = ImageFetcher(downloader: mockDownloader, storage: storage)
   }
 

diff --git a/ImaginaryTests-iOS/MultipleImageFetcherTests.swift b/ImaginaryTests-iOS/MultipleImageFetcherTests.swift
@@ -3,12 +3,12 @@ import Cache
 import Imaginary
 
 private final class MultipleImageFetcherTests: XCTestCase {
-  var storage: Storage<Image>!
+  var storage: Storage<String, Image>!
 
   override func setUp() {
     super.setUp()
 
-    storage = try! Storage<Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
+    storage = try! Storage<String, Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
   }
 
   override func tearDown() {

diff --git a/Sources/Shared/Fetcher/ImageFetcher.swift b/Sources/Shared/Fetcher/ImageFetcher.swift
@@ -5,14 +5,14 @@ import Cache
 /// It can be fetched from storage or network.
 public class ImageFetcher {
   private let downloader: ImageDownloader
-  private let storage: Storage<Image>?
+  private let storage: Storage<String, Image>?
 
   /// Initialize ImageFetcehr
   ///
   /// - Parameters:
   ///   - downloader: Used to download images.
   ///   - storage: Used to store downloaded images. Pass nil to ignore cache
-  public init(downloader: ImageDownloader, storage: Storage<Image>?) {
+  public init(downloader: ImageDownloader, storage: Storage<String, Image>?) {
     self.downloader = downloader
     self.storage = storage
   }

diff --git a/Sources/Shared/Library/Configuration.swift b/Sources/Shared/Library/Configuration.swift
@@ -16,13 +16,13 @@ public struct Configuration {
   public static var trackError: ((URL, Error) -> Void)?
 
   /// The default storage
-  public static var imageStorage: Storage<Image> = {
+  public static var imageStorage: Storage<String, Image> = {
     let diskConfig = DiskConfig(name: "Imaginary",
                                 expiry: .date(Date().addingTimeInterval(60 * 60 * 24 * 3)))
     let memoryConfig = MemoryConfig(countLimit: 10, totalCostLimit: 0)
 
     do {
-      return try Storage<Image>(
+      return try Storage<String, Image>(
         diskConfig: diskConfig,
         memoryConfig: memoryConfig,
         transformer: TransformerFactory.forImage()

diff --git a/Sources/Shared/Library/Option.swift b/Sources/Shared/Library/Option.swift
@@ -13,7 +13,7 @@ public struct Option {
   /// Specify Storage for memory and disk cache.
   /// Defaults to Configuration.imageStorage.
   /// Return nil to ignore cache
-  public var storageMaker: () -> Storage<Image>? = {
+  public var storageMaker: () -> Storage<String, Image>? = {
     return Configuration.imageStorage
   }