Skip to content

Commit c7be321

Browse files
3lvis3lvis
committed
Update project and dependencies
1 parent bc3e2f9 commit c7be321

File tree

10 files changed

+48
-54
lines changed

10 files changed

+48
-54
lines changed

‎Imaginary.xcodeproj/project.pbxproj

+17-11
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
isa = PBXProject;
475475
attributes = {
476476
LastSwiftUpdateCheck = 0900;
477-
LastUpgradeCheck = 1030;
477+
LastUpgradeCheck = 1200;
478478
ORGANIZATIONNAME = "Hyper Interaktiv AS";
479479
TargetAttributes = {
480480
BDE8FBE81D1BFB9F00C5A212 = {
@@ -692,7 +692,7 @@
692692
"@executable_path/../Frameworks",
693693
"@loader_path/Frameworks",
694694
);
695-
MACOSX_DEPLOYMENT_TARGET = 10.11;
695+
MACOSX_DEPLOYMENT_TARGET = 10.12;
696696
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Imaginary-Mac";
697697
PRODUCT_NAME = Imaginary;
698698
SDKROOT = macosx;
@@ -720,7 +720,7 @@
720720
"@executable_path/../Frameworks",
721721
"@loader_path/Frameworks",
722722
);
723-
MACOSX_DEPLOYMENT_TARGET = 10.11;
723+
MACOSX_DEPLOYMENT_TARGET = 10.12;
724724
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Imaginary-Mac";
725725
PRODUCT_NAME = Imaginary;
726726
SDKROOT = macosx;
@@ -822,7 +822,7 @@
822822
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
823823
SWIFT_VERSION = 5.0;
824824
TARGETED_DEVICE_FAMILY = 3;
825-
TVOS_DEPLOYMENT_TARGET = 11.0;
825+
TVOS_DEPLOYMENT_TARGET = 12.0;
826826
};
827827
name = Debug;
828828
};
@@ -849,7 +849,7 @@
849849
SDKROOT = appletvos;
850850
SWIFT_VERSION = 5.0;
851851
TARGETED_DEVICE_FAMILY = 3;
852-
TVOS_DEPLOYMENT_TARGET = 11.0;
852+
TVOS_DEPLOYMENT_TARGET = 12.0;
853853
};
854854
name = Release;
855855
};
@@ -868,7 +868,7 @@
868868
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
869869
GCC_C_LANGUAGE_STANDARD = gnu11;
870870
INFOPLIST_FILE = "ImaginaryTests-iOS/Info.plist";
871-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
871+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
872872
LD_RUNPATH_SEARCH_PATHS = (
873873
"$(inherited)",
874874
"@executable_path/Frameworks",
@@ -898,7 +898,7 @@
898898
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
899899
GCC_C_LANGUAGE_STANDARD = gnu11;
900900
INFOPLIST_FILE = "ImaginaryTests-iOS/Info.plist";
901-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
901+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
902902
LD_RUNPATH_SEARCH_PATHS = (
903903
"$(inherited)",
904904
"@executable_path/Frameworks",
@@ -935,6 +935,7 @@
935935
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
936936
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
937937
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
938+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
938939
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
939940
CLANG_WARN_STRICT_PROTOTYPES = YES;
940941
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -960,7 +961,7 @@
960961
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
961962
GCC_WARN_UNUSED_FUNCTION = YES;
962963
GCC_WARN_UNUSED_VARIABLE = YES;
963-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
964+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
964965
MTL_ENABLE_DEBUG_INFO = YES;
965966
ONLY_ACTIVE_ARCH = YES;
966967
SDKROOT = iphoneos;
@@ -995,6 +996,7 @@
995996
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
996997
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
997998
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
999+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
9981000
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
9991001
CLANG_WARN_STRICT_PROTOTYPES = YES;
10001002
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1014,7 +1016,7 @@
10141016
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10151017
GCC_WARN_UNUSED_FUNCTION = YES;
10161018
GCC_WARN_UNUSED_VARIABLE = YES;
1017-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
1019+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
10181020
MTL_ENABLE_DEBUG_INFO = NO;
10191021
SDKROOT = iphoneos;
10201022
SWIFT_COMPILATION_MODE = wholemodule;
@@ -1038,7 +1040,7 @@
10381040
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
10391041
INFOPLIST_FILE = "$(SRCROOT)/Imaginary/iOS/Info.plist";
10401042
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1041-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1043+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
10421044
LD_RUNPATH_SEARCH_PATHS = (
10431045
"$(inherited)",
10441046
"@executable_path/Frameworks",
@@ -1047,7 +1049,9 @@
10471049
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Imaginary;
10481050
PRODUCT_NAME = Imaginary;
10491051
SKIP_INSTALL = YES;
1052+
SUPPORTS_MACCATALYST = NO;
10501053
SWIFT_VERSION = 5.0;
1054+
TARGETED_DEVICE_FAMILY = "1,2";
10511055
};
10521056
name = Debug;
10531057
};
@@ -1062,7 +1066,7 @@
10621066
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
10631067
INFOPLIST_FILE = "$(SRCROOT)/Imaginary/iOS/Info.plist";
10641068
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1065-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1069+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
10661070
LD_RUNPATH_SEARCH_PATHS = (
10671071
"$(inherited)",
10681072
"@executable_path/Frameworks",
@@ -1071,7 +1075,9 @@
10711075
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Imaginary;
10721076
PRODUCT_NAME = Imaginary;
10731077
SKIP_INSTALL = YES;
1078+
SUPPORTS_MACCATALYST = NO;
10741079
SWIFT_VERSION = 5.0;
1080+
TARGETED_DEVICE_FAMILY = "1,2";
10751081
};
10761082
name = Release;
10771083
};

‎Imaginary.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"repositoryURL": "https://github.com/hyperoslo/Cache.git",
77
"state": {
88
"branch": "master",
9-
"revision": "042b2cd22d3c8c30fdcead0c613de94a1d648123",
9+
"revision": "c7f4d633049c3bd649a353bad36f6c17e9df085f",
1010
"version": null
1111
}
1212
}

‎Imaginary.xcodeproj/xcshareddata/xcschemes/Imaginary-iOS.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "D5DF75901C403D8200BF1AB6"
34+
BuildableName = "Imaginary.framework"
35+
BlueprintName = "Imaginary-iOS"
36+
ReferencedContainer = "container:Imaginary.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "D5DF75901C403D8200BF1AB6"
46-
BuildableName = "Imaginary.framework"
47-
BlueprintName = "Imaginary-iOS"
48-
ReferencedContainer = "container:Imaginary.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Imaginary.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎Imaginary.xcodeproj/xcshareddata/xcschemes/Imaginary-macOS.xcscheme

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:Imaginary.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎Imaginary.xcodeproj/xcshareddata/xcschemes/Imaginary-tvOS.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "D21352C11F7540E400B5375B"
34+
BuildableName = "Imaginary.framework"
35+
BlueprintName = "Imaginary-tvOS"
36+
ReferencedContainer = "container:Imaginary.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "D21352C11F7540E400B5375B"
46-
BuildableName = "Imaginary.framework"
47-
BlueprintName = "Imaginary-tvOS"
48-
ReferencedContainer = "container:Imaginary.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Imaginary.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎ImaginaryTests-iOS/ImageFetcherTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import Cache
33
@testable import Imaginary
44

55
private final class ImageFetcherTests: XCTestCase {
6-
var storage: Storage<Image>!
6+
var storage: Storage<String, Image>!
77
var fetcher: ImageFetcher!
88
fileprivate var mockDownloader = MockDownloader(modifyRequest: { $0 })
99
let url = URL(string: "https://no.hyper/imaginary.png")!
1010

1111
override func setUp() {
1212
super.setUp()
1313

14-
storage = try! Storage<Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
14+
storage = try! Storage<String, Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
1515
fetcher = ImageFetcher(downloader: mockDownloader, storage: storage)
1616
}
1717

‎ImaginaryTests-iOS/MultipleImageFetcherTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import Cache
33
import Imaginary
44

55
private final class MultipleImageFetcherTests: XCTestCase {
6-
var storage: Storage<Image>!
6+
var storage: Storage<String, Image>!
77

88
override func setUp() {
99
super.setUp()
1010

11-
storage = try! Storage<Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
11+
storage = try! Storage<String, Image>(diskConfig: DiskConfig(name: "Floppy"), memoryConfig: MemoryConfig(), transformer: TransformerFactory.forImage())
1212
}
1313

1414
override func tearDown() {

‎Sources/Shared/Fetcher/ImageFetcher.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import Cache
55
/// It can be fetched from storage or network.
66
public class ImageFetcher {
77
private let downloader: ImageDownloader
8-
private let storage: Storage<Image>?
8+
private let storage: Storage<String, Image>?
99

1010
/// Initialize ImageFetcehr
1111
///
1212
/// - Parameters:
1313
/// - downloader: Used to download images.
1414
/// - storage: Used to store downloaded images. Pass nil to ignore cache
15-
public init(downloader: ImageDownloader, storage: Storage<Image>?) {
15+
public init(downloader: ImageDownloader, storage: Storage<String, Image>?) {
1616
self.downloader = downloader
1717
self.storage = storage
1818
}

‎Sources/Shared/Library/Configuration.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ public struct Configuration {
1616
public static var trackError: ((URL, Error) -> Void)?
1717

1818
/// The default storage
19-
public static var imageStorage: Storage<Image> = {
19+
public static var imageStorage: Storage<String, Image> = {
2020
let diskConfig = DiskConfig(name: "Imaginary",
2121
expiry: .date(Date().addingTimeInterval(60 * 60 * 24 * 3)))
2222
let memoryConfig = MemoryConfig(countLimit: 10, totalCostLimit: 0)
2323

2424
do {
25-
return try Storage<Image>(
25+
return try Storage<String, Image>(
2626
diskConfig: diskConfig,
2727
memoryConfig: memoryConfig,
2828
transformer: TransformerFactory.forImage()

‎Sources/Shared/Library/Option.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Option {
1313
/// Specify Storage for memory and disk cache.
1414
/// Defaults to Configuration.imageStorage.
1515
/// Return nil to ignore cache
16-
public var storageMaker: () -> Storage<Image>? = {
16+
public var storageMaker: () -> Storage<String, Image>? = {
1717
return Configuration.imageStorage
1818
}
1919

0 commit comments

Comments
 (0)