Skip to content

Commit 79bfb12

Browse files
3lvis3lvis
authored
Merge pull request #266 from hyperoslo/update-project-settings
Update project settings
2 parents f70b03a + b879f4d commit 79bfb12

File tree

5 files changed

+46
-59
lines changed

5 files changed

+46
-59
lines changed

‎Cache.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@
667667
isa = PBXProject;
668668
attributes = {
669669
LastSwiftUpdateCheck = 0800;
670-
LastUpgradeCheck = 1030;
670+
LastUpgradeCheck = 1200;
671671
ORGANIZATIONNAME = "Hyper Interaktiv AS";
672672
TargetAttributes = {
673673
BDEDD3551DBCE5B1007416A6 = {
@@ -1001,7 +1001,7 @@
10011001
SKIP_INSTALL = YES;
10021002
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10031003
TARGETED_DEVICE_FAMILY = 3;
1004-
TVOS_DEPLOYMENT_TARGET = 9.2;
1004+
TVOS_DEPLOYMENT_TARGET = 12.0;
10051005
};
10061006
name = Debug;
10071007
};
@@ -1026,7 +1026,7 @@
10261026
SDKROOT = appletvos;
10271027
SKIP_INSTALL = YES;
10281028
TARGETED_DEVICE_FAMILY = 3;
1029-
TVOS_DEPLOYMENT_TARGET = 9.2;
1029+
TVOS_DEPLOYMENT_TARGET = 12.0;
10301030
};
10311031
name = Release;
10321032
};
@@ -1046,7 +1046,7 @@
10461046
SDKROOT = appletvos;
10471047
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10481048
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1049-
TVOS_DEPLOYMENT_TARGET = 10.0;
1049+
TVOS_DEPLOYMENT_TARGET = 12.0;
10501050
};
10511051
name = Debug;
10521052
};
@@ -1064,7 +1064,7 @@
10641064
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-tvOS-Tests";
10651065
PRODUCT_NAME = "$(TARGET_NAME)";
10661066
SDKROOT = appletvos;
1067-
TVOS_DEPLOYMENT_TARGET = 10.0;
1067+
TVOS_DEPLOYMENT_TARGET = 12.0;
10681068
};
10691069
name = Release;
10701070
};
@@ -1107,7 +1107,7 @@
11071107
INFOPLIST_FILE = "$(SRCROOT)/SupportFiles/Mac/Info.plist";
11081108
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11091109
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1110-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1110+
MACOSX_DEPLOYMENT_TARGET = 10.13;
11111111
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-Mac";
11121112
PRODUCT_NAME = Cache;
11131113
SDKROOT = macosx;
@@ -1129,7 +1129,7 @@
11291129
INFOPLIST_FILE = "$(SRCROOT)/SupportFiles/Mac/Info.plist";
11301130
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11311131
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1132-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1132+
MACOSX_DEPLOYMENT_TARGET = 10.13;
11331133
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-Mac";
11341134
PRODUCT_NAME = Cache;
11351135
SDKROOT = macosx;
@@ -1145,7 +1145,7 @@
11451145
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
11461146
INFOPLIST_FILE = "$(SRCROOT)/Tests/Mac/Info.plist";
11471147
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1148-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1148+
MACOSX_DEPLOYMENT_TARGET = 10.13;
11491149
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-MacTests";
11501150
PRODUCT_NAME = "$(TARGET_NAME)";
11511151
SDKROOT = macosx;
@@ -1160,7 +1160,7 @@
11601160
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
11611161
INFOPLIST_FILE = "$(SRCROOT)/Tests/Mac/Info.plist";
11621162
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1163-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1163+
MACOSX_DEPLOYMENT_TARGET = 10.13;
11641164
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cache-MacTests";
11651165
PRODUCT_NAME = "$(TARGET_NAME)";
11661166
SDKROOT = macosx;
@@ -1190,6 +1190,7 @@
11901190
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11911191
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11921192
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1193+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
11931194
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
11941195
CLANG_WARN_STRICT_PROTOTYPES = YES;
11951196
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1215,7 +1216,7 @@
12151216
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12161217
GCC_WARN_UNUSED_FUNCTION = YES;
12171218
GCC_WARN_UNUSED_VARIABLE = YES;
1218-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
1219+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12191220
MTL_ENABLE_DEBUG_INFO = YES;
12201221
ONLY_ACTIVE_ARCH = YES;
12211222
SDKROOT = iphoneos;
@@ -1250,6 +1251,7 @@
12501251
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12511252
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12521253
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1254+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
12531255
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12541256
CLANG_WARN_STRICT_PROTOTYPES = YES;
12551257
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1269,7 +1271,7 @@
12691271
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12701272
GCC_WARN_UNUSED_FUNCTION = YES;
12711273
GCC_WARN_UNUSED_VARIABLE = YES;
1272-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
1274+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12731275
MTL_ENABLE_DEBUG_INFO = NO;
12741276
SDKROOT = iphoneos;
12751277
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1292,7 +1294,7 @@
12921294
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
12931295
INFOPLIST_FILE = "$(SRCROOT)/SupportFiles/iOS/Info.plist";
12941296
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1295-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1297+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12961298
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12971299
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Cache;
12981300
PRODUCT_NAME = Cache;
@@ -1311,7 +1313,7 @@
13111313
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
13121314
INFOPLIST_FILE = "$(SRCROOT)/SupportFiles/iOS/Info.plist";
13131315
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1314-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1316+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
13151317
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13161318
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Cache;
13171319
PRODUCT_NAME = Cache;

‎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 = "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 = "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 = "1030"
3+
LastUpgradeVersion = "1200"
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 = "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 = "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"

‎Tests/Shared/TestHelper.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ struct TestHelper {
1313
}
1414

1515
static func triggerApplicationEvents() {
16-
#if (iOS)
17-
NotificationCenter.default.post(name: UIApplication.didEnterBackgroundNotification, object: nil)
18-
NotificationCenter.default.post(name: UIApplication.willTerminateNotification, object: nil)
19-
#elseif os(tvOS)
16+
#if os(iOS) || os(tvOS)
2017
NotificationCenter.default.post(name: UIApplication.didEnterBackgroundNotification, object: nil)
2118
NotificationCenter.default.post(name: UIApplication.willTerminateNotification, object: nil)
2219
#else

0 commit comments

Comments
 (0)