Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit 51a19bc

Browse files
rfldhsrfldhs
authored
Merge pull request #1 from thepeaklab/feature/ECON002-31-update-project
Feature/econ002 31 update project
2 parents 6adcf97 + 1196376 commit 51a19bc

File tree

15 files changed

+76
-66
lines changed

15 files changed

+76
-66
lines changed

‎Cache.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@
667667
isa = PBXProject;
668668
attributes = {
669669
LastSwiftUpdateCheck = 0800;
670-
LastUpgradeCheck = 0930;
670+
LastUpgradeCheck = 1130;
671671
ORGANIZATIONNAME = "Hyper Interaktiv AS";
672672
TargetAttributes = {
673673
BDEDD3551DBCE5B1007416A6 = {
@@ -700,6 +700,7 @@
700700
developmentRegion = English;
701701
hasScannedForEncodings = 0;
702702
knownRegions = (
703+
English,
703704
en,
704705
);
705706
mainGroup = D5DC59D61C20593E003BD79B;
@@ -999,6 +1000,7 @@
9991000
SDKROOT = appletvos;
10001001
SKIP_INSTALL = YES;
10011002
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1003+
SWIFT_VERSION = 5.0;
10021004
TARGETED_DEVICE_FAMILY = 3;
10031005
TVOS_DEPLOYMENT_TARGET = 9.2;
10041006
};
@@ -1024,6 +1026,7 @@
10241026
PRODUCT_NAME = Cache;
10251027
SDKROOT = appletvos;
10261028
SKIP_INSTALL = YES;
1029+
SWIFT_VERSION = 5.0;
10271030
TARGETED_DEVICE_FAMILY = 3;
10281031
TVOS_DEPLOYMENT_TARGET = 9.2;
10291032
};
@@ -1045,6 +1048,7 @@
10451048
SDKROOT = appletvos;
10461049
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10471050
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1051+
SWIFT_VERSION = 5.0;
10481052
TVOS_DEPLOYMENT_TARGET = 10.0;
10491053
};
10501054
name = Debug;
@@ -1063,6 +1067,7 @@
10631067
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-tvOS-Tests";
10641068
PRODUCT_NAME = "$(TARGET_NAME)";
10651069
SDKROOT = appletvos;
1070+
SWIFT_VERSION = 5.0;
10661071
TVOS_DEPLOYMENT_TARGET = 10.0;
10671072
};
10681073
name = Release;
@@ -1077,6 +1082,7 @@
10771082
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-iOS-Tests";
10781083
PRODUCT_NAME = "$(TARGET_NAME)";
10791084
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1085+
SWIFT_VERSION = 5.0;
10801086
};
10811087
name = Debug;
10821088
};
@@ -1089,6 +1095,7 @@
10891095
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10901096
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-iOS-Tests";
10911097
PRODUCT_NAME = "$(TARGET_NAME)";
1098+
SWIFT_VERSION = 5.0;
10921099
};
10931100
name = Release;
10941101
};
@@ -1111,6 +1118,7 @@
11111118
PRODUCT_NAME = Cache;
11121119
SDKROOT = macosx;
11131120
SKIP_INSTALL = YES;
1121+
SWIFT_VERSION = 5.0;
11141122
};
11151123
name = Debug;
11161124
};
@@ -1133,6 +1141,7 @@
11331141
PRODUCT_NAME = Cache;
11341142
SDKROOT = macosx;
11351143
SKIP_INSTALL = YES;
1144+
SWIFT_VERSION = 5.0;
11361145
};
11371146
name = Release;
11381147
};
@@ -1148,6 +1157,7 @@
11481157
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-MacTests";
11491158
PRODUCT_NAME = "$(TARGET_NAME)";
11501159
SDKROOT = macosx;
1160+
SWIFT_VERSION = 5.0;
11511161
};
11521162
name = Debug;
11531163
};
@@ -1163,13 +1173,15 @@
11631173
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-MacTests";
11641174
PRODUCT_NAME = "$(TARGET_NAME)";
11651175
SDKROOT = macosx;
1176+
SWIFT_VERSION = 5.0;
11661177
};
11671178
name = Release;
11681179
};
11691180
D5DC59F21C20593E003BD79B /* Debug */ = {
11701181
isa = XCBuildConfiguration;
11711182
buildSettings = {
11721183
ALWAYS_SEARCH_USER_PATHS = NO;
1184+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
11731185
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
11741186
CLANG_CXX_LIBRARY = "libc++";
11751187
CLANG_ENABLE_MODULES = YES;
@@ -1229,6 +1241,7 @@
12291241
isa = XCBuildConfiguration;
12301242
buildSettings = {
12311243
ALWAYS_SEARCH_USER_PATHS = NO;
1244+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
12321245
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
12331246
CLANG_CXX_LIBRARY = "libc++";
12341247
CLANG_ENABLE_MODULES = YES;
@@ -1294,6 +1307,7 @@
12941307
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Cache;
12951308
PRODUCT_NAME = Cache;
12961309
SKIP_INSTALL = YES;
1310+
SWIFT_VERSION = 5.0;
12971311
};
12981312
name = Debug;
12991313
};
@@ -1313,6 +1327,7 @@
13131327
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Cache;
13141328
PRODUCT_NAME = Cache;
13151329
SKIP_INSTALL = YES;
1330+
SWIFT_VERSION = 5.0;
13161331
};
13171332
name = Release;
13181333
};

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1130"
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 = "D5DC59DF1C20593E003BD79B"
34+
BuildableName = "Cache.framework"
35+
BlueprintName = "Cache-iOS"
36+
ReferencedContainer = "container:Cache.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO"
@@ -41,17 +50,6 @@
4150
</BuildableReference>
4251
</TestableReference>
4352
</Testables>
44-
<MacroExpansion>
45-
<BuildableReference
46-
BuildableIdentifier = "primary"
47-
BlueprintIdentifier = "D5DC59DF1C20593E003BD79B"
48-
BuildableName = "Cache.framework"
49-
BlueprintName = "Cache-iOS"
50-
ReferencedContainer = "container:Cache.xcodeproj">
51-
</BuildableReference>
52-
</MacroExpansion>
53-
<AdditionalOptions>
54-
</AdditionalOptions>
5553
</TestAction>
5654
<LaunchAction
5755
buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
7270
ReferencedContainer = "container:Cache.xcodeproj">
7371
</BuildableReference>
7472
</MacroExpansion>
75-
<AdditionalOptions>
76-
</AdditionalOptions>
7773
</LaunchAction>
7874
<ProfileAction
7975
buildConfiguration = "Release"

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "D5291D5F1C283B5300B702C9"
48+
BuildableName = "Cache.framework"
49+
BlueprintName = "Cache-Mac"
50+
ReferencedContainer = "container:Cache.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO"
@@ -55,17 +64,6 @@
5564
</BuildableReference>
5665
</TestableReference>
5766
</Testables>
58-
<MacroExpansion>
59-
<BuildableReference
60-
BuildableIdentifier = "primary"
61-
BlueprintIdentifier = "D5291D5F1C283B5300B702C9"
62-
BuildableName = "Cache.framework"
63-
BlueprintName = "Cache-Mac"
64-
ReferencedContainer = "container:Cache.xcodeproj">
65-
</BuildableReference>
66-
</MacroExpansion>
67-
<AdditionalOptions>
68-
</AdditionalOptions>
6967
</TestAction>
7068
<LaunchAction
7169
buildConfiguration = "Debug"
@@ -86,8 +84,6 @@
8684
ReferencedContainer = "container:Cache.xcodeproj">
8785
</BuildableReference>
8886
</MacroExpansion>
89-
<AdditionalOptions>
90-
</AdditionalOptions>
9187
</LaunchAction>
9288
<ProfileAction
9389
buildConfiguration = "Release"

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1130"
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 = "BDEDD3551DBCE5B1007416A6"
34+
BuildableName = "Cache.framework"
35+
BlueprintName = "Cache-tvOS"
36+
ReferencedContainer = "container:Cache.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO"
@@ -41,17 +50,6 @@
4150
</BuildableReference>
4251
</TestableReference>
4352
</Testables>
44-
<MacroExpansion>
45-
<BuildableReference
46-
BuildableIdentifier = "primary"
47-
BlueprintIdentifier = "BDEDD3551DBCE5B1007416A6"
48-
BuildableName = "Cache.framework"
49-
BlueprintName = "Cache-tvOS"
50-
ReferencedContainer = "container:Cache.xcodeproj">
51-
</BuildableReference>
52-
</MacroExpansion>
53-
<AdditionalOptions>
54-
</AdditionalOptions>
5553
</TestAction>
5654
<LaunchAction
5755
buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
7270
ReferencedContainer = "container:Cache.xcodeproj">
7371
</BuildableReference>
7472
</MacroExpansion>
75-
<AdditionalOptions>
76-
</AdditionalOptions>
7773
</LaunchAction>
7874
<ProfileAction
7975
buildConfiguration = "Release"

‎Package.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:5.1
22

33
import PackageDescription
44

@@ -13,11 +13,12 @@ let package = Package(
1313
targets: [
1414
.target(
1515
name: "Cache",
16-
path: "Source/Shared",
16+
path: "Source",
1717
exclude: ["Library/ImageWrapper.swift"]), // relative to the target path
1818
.testTarget(
1919
name: "CacheTests",
2020
dependencies: ["Cache"],
2121
path: "Tests"),
22-
]
22+
],
23+
swiftLanguageVersions: [.v5]
2324
)

‎Source/Mac/NSImage+Extensions.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if canImport(AppKit)
12
import AppKit
23

34
/// Helper UIImage extension.
@@ -34,3 +35,5 @@ extension NSImage {
3435
.representation(using: imageFileType, properties: [:])
3536
}
3637
}
38+
39+
#endif

‎Source/Shared/Configuration/MemoryConfig.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ public struct MemoryConfig {
1717
self.countLimit = countLimit
1818
self.totalCostLimit = totalCostLimit
1919
}
20+
2021
}

‎Source/Shared/Extensions/Date+Extensions.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ extension Date {
99
var inThePast: Bool {
1010
return timeIntervalSinceNow < 0
1111
}
12+
1213
}

‎Source/Shared/Extensions/JSONDecoder+Extensions.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ public extension JSONDecoder {
3939
static func decode<T: Codable>(_ data: Data, to type: T.Type) throws -> T {
4040
return try JSONDecoder().decode(T.self, from: data)
4141
}
42+
4243
}

‎Source/Shared/Library/ImageWrapper.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Foundation
22

33
public struct ImageWrapper: Codable {
4+
45
public let image: Image
56

67
public enum CodingKeys: String, CodingKey {
@@ -29,4 +30,5 @@ public struct ImageWrapper: Codable {
2930

3031
try container.encode(data, forKey: CodingKeys.image)
3132
}
33+
3234
}

0 commit comments

Comments
 (0)