Skip to content
This repository was archived by the owner on Dec 5, 2022. It is now read-only.

Commit 85ed87c

Browse files
committed
Update project to Swift 4.2
1 parent e05f244 commit 85ed87c

File tree

7 files changed

+32
-8
lines changed

7 files changed

+32
-8
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1
1+
4.2

DeepDiff.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@
900900
ONLY_ACTIVE_ARCH = YES;
901901
SDKROOT = iphoneos;
902902
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
903-
SWIFT_VERSION = 4.0;
903+
SWIFT_VERSION = 4.2;
904904
TARGETED_DEVICE_FAMILY = "1,2";
905905
VERSIONING_SYSTEM = "apple-generic";
906906
VERSION_INFO_PREFIX = "";
@@ -952,7 +952,7 @@
952952
MTL_ENABLE_DEBUG_INFO = NO;
953953
SDKROOT = iphoneos;
954954
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
955-
SWIFT_VERSION = 4.0;
955+
SWIFT_VERSION = 4.2;
956956
TARGETED_DEVICE_FAMILY = "1,2";
957957
VALIDATE_PRODUCT = YES;
958958
VERSIONING_SYSTEM = "apple-generic";

Example/Benchmark/Benchmark.xcodeproj/project.pbxproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
isa = PBXProject;
119119
attributes = {
120120
LastSwiftUpdateCheck = 0920;
121-
LastUpgradeCheck = 0920;
121+
LastUpgradeCheck = 1000;
122122
ORGANIZATIONNAME = Fantageek;
123123
TargetAttributes = {
124124
D2FFBC141FFE2DDA0051D319 = {
@@ -266,13 +266,15 @@
266266
CLANG_WARN_BOOL_CONVERSION = YES;
267267
CLANG_WARN_COMMA = YES;
268268
CLANG_WARN_CONSTANT_CONVERSION = YES;
269+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
269270
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
270271
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
271272
CLANG_WARN_EMPTY_BODY = YES;
272273
CLANG_WARN_ENUM_CONVERSION = YES;
273274
CLANG_WARN_INFINITE_RECURSION = YES;
274275
CLANG_WARN_INT_CONVERSION = YES;
275276
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
277+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
276278
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
277279
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
278280
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -306,6 +308,7 @@
306308
SDKROOT = iphoneos;
307309
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
308310
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
311+
SWIFT_VERSION = 4.2;
309312
};
310313
name = Debug;
311314
};
@@ -323,13 +326,15 @@
323326
CLANG_WARN_BOOL_CONVERSION = YES;
324327
CLANG_WARN_COMMA = YES;
325328
CLANG_WARN_CONSTANT_CONVERSION = YES;
329+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
326330
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
327331
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
328332
CLANG_WARN_EMPTY_BODY = YES;
329333
CLANG_WARN_ENUM_CONVERSION = YES;
330334
CLANG_WARN_INFINITE_RECURSION = YES;
331335
CLANG_WARN_INT_CONVERSION = YES;
332336
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
337+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
333338
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
334339
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
335340
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -355,6 +360,7 @@
355360
MTL_ENABLE_DEBUG_INFO = NO;
356361
SDKROOT = iphoneos;
357362
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
363+
SWIFT_VERSION = 4.2;
358364
VALIDATE_PRODUCT = YES;
359365
};
360366
name = Release;
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Example/DeepDiffDemo/DeepDiffDemo.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
isa = PBXProject;
179179
attributes = {
180180
LastSwiftUpdateCheck = 0720;
181-
LastUpgradeCheck = 0900;
181+
LastUpgradeCheck = 1000;
182182
ORGANIZATIONNAME = "Hyper Interaktiv AS";
183183
TargetAttributes = {
184184
D5C7F73F1C3BC9CE008CDDBA = {
@@ -329,12 +329,14 @@
329329
CLANG_WARN_BOOL_CONVERSION = YES;
330330
CLANG_WARN_COMMA = YES;
331331
CLANG_WARN_CONSTANT_CONVERSION = YES;
332+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
332333
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
333334
CLANG_WARN_EMPTY_BODY = YES;
334335
CLANG_WARN_ENUM_CONVERSION = YES;
335336
CLANG_WARN_INFINITE_RECURSION = YES;
336337
CLANG_WARN_INT_CONVERSION = YES;
337338
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
339+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
338340
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
339341
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
340342
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -382,12 +384,14 @@
382384
CLANG_WARN_BOOL_CONVERSION = YES;
383385
CLANG_WARN_COMMA = YES;
384386
CLANG_WARN_CONSTANT_CONVERSION = YES;
387+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
385388
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
386389
CLANG_WARN_EMPTY_BODY = YES;
387390
CLANG_WARN_ENUM_CONVERSION = YES;
388391
CLANG_WARN_INFINITE_RECURSION = YES;
389392
CLANG_WARN_INT_CONVERSION = YES;
390393
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
394+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
391395
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
392396
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
393397
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

Example/DeepDiffDemo/DeepDiffDemo.xcodeproj/xcshareddata/xcschemes/DeepDiffDemo.xcscheme

Lines changed: 1 addition & 3 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 = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)