Skip to content

Commit dfbaf87

Browse files
committed
switch to Swift 4 (no code changes)
1 parent 24259b8 commit dfbaf87

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

FURRDiff.xcodeproj/project.pbxproj

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@
157157
isa = PBXProject;
158158
attributes = {
159159
LastSwiftUpdateCheck = 0700;
160-
LastUpgradeCheck = 0900;
160+
LastUpgradeCheck = 0930;
161161
ORGANIZATIONNAME = "Ruotger Deecke";
162162
TargetAttributes = {
163163
5698BA611B8DD18E008805E2 = {
164164
CreatedOnToolsVersion = 7.0;
165-
LastSwiftMigration = 0800;
165+
LastSwiftMigration = 0930;
166166
};
167167
5698BA6B1B8DD18E008805E2 = {
168168
CreatedOnToolsVersion = 7.0;
169-
LastSwiftMigration = 0800;
169+
LastSwiftMigration = 0930;
170170
};
171171
};
172172
};
@@ -291,12 +291,14 @@
291291
CLANG_WARN_BOOL_CONVERSION = YES;
292292
CLANG_WARN_COMMA = YES;
293293
CLANG_WARN_CONSTANT_CONVERSION = YES;
294+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
294295
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
295296
CLANG_WARN_EMPTY_BODY = YES;
296297
CLANG_WARN_ENUM_CONVERSION = YES;
297298
CLANG_WARN_INFINITE_RECURSION = YES;
298299
CLANG_WARN_INT_CONVERSION = YES;
299300
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
301+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
300302
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
301303
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
302304
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -348,12 +350,14 @@
348350
CLANG_WARN_BOOL_CONVERSION = YES;
349351
CLANG_WARN_COMMA = YES;
350352
CLANG_WARN_CONSTANT_CONVERSION = YES;
353+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
351354
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
352355
CLANG_WARN_EMPTY_BODY = YES;
353356
CLANG_WARN_ENUM_CONVERSION = YES;
354357
CLANG_WARN_INFINITE_RECURSION = YES;
355358
CLANG_WARN_INT_CONVERSION = YES;
356359
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
360+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
357361
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
358362
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
359363
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -407,6 +411,7 @@
407411
PRODUCT_NAME = FURRDiff;
408412
SKIP_INSTALL = YES;
409413
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
414+
SWIFT_VERSION = 4.0;
410415
};
411416
name = Debug;
412417
};
@@ -430,7 +435,9 @@
430435
PRODUCT_BUNDLE_IDENTIFIER = com.RuotgerSkupin.Diff;
431436
PRODUCT_NAME = FURRDiff;
432437
SKIP_INSTALL = YES;
438+
SWIFT_COMPILATION_MODE = wholemodule;
433439
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
440+
SWIFT_VERSION = 4.0;
434441
};
435442
name = Release;
436443
};
@@ -447,6 +454,7 @@
447454
PRODUCT_BUNDLE_IDENTIFIER = com.RuotgerSkupin.DiffTests;
448455
PRODUCT_MODULE_NAME = FURRDiffTests;
449456
PRODUCT_NAME = FURRDiff;
457+
SWIFT_VERSION = 4.0;
450458
};
451459
name = Debug;
452460
};
@@ -463,7 +471,9 @@
463471
PRODUCT_BUNDLE_IDENTIFIER = com.RuotgerSkupin.DiffTests;
464472
PRODUCT_MODULE_NAME = FURRDiffTests;
465473
PRODUCT_NAME = FURRDiff;
474+
SWIFT_COMPILATION_MODE = wholemodule;
466475
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
476+
SWIFT_VERSION = 4.0;
467477
};
468478
name = Release;
469479
};

FURRDiff.xcodeproj/xcshareddata/xcschemes/FURRDiff.xcscheme

Lines changed: 3 additions & 5 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 = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)