Skip to content

Commit 48c15e7

Browse files
mbucheticsmbuchetics
committed
swift 4 support
1 parent 2a1c293 commit 48c15e7

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

Diff for: ‎Example.xcodeproj/project.pbxproj

+24-10
Original file line numberDiff line numberDiff line change
@@ -267,21 +267,21 @@
267267
isa = PBXProject;
268268
attributes = {
269269
LastSwiftUpdateCheck = 0720;
270-
LastUpgradeCheck = 0810;
270+
LastUpgradeCheck = 0900;
271271
ORGANIZATIONNAME = "aaa - all about apps GmbH";
272272
TargetAttributes = {
273273
395D147B1B90610A00658680 = {
274274
CreatedOnToolsVersion = 7.0;
275-
LastSwiftMigration = 0800;
275+
LastSwiftMigration = 0900;
276276
ProvisioningStyle = Automatic;
277277
};
278278
395D14A31B90612D00658680 = {
279279
CreatedOnToolsVersion = 7.0;
280-
LastSwiftMigration = 0800;
280+
LastSwiftMigration = 0900;
281281
};
282282
395D14AC1B90612D00658680 = {
283283
CreatedOnToolsVersion = 7.0;
284-
LastSwiftMigration = 0800;
284+
LastSwiftMigration = 0900;
285285
};
286286
};
287287
};
@@ -413,14 +413,20 @@
413413
CLANG_CXX_LIBRARY = "libc++";
414414
CLANG_ENABLE_MODULES = YES;
415415
CLANG_ENABLE_OBJC_ARC = YES;
416+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
416417
CLANG_WARN_BOOL_CONVERSION = YES;
418+
CLANG_WARN_COMMA = YES;
417419
CLANG_WARN_CONSTANT_CONVERSION = YES;
418420
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
419421
CLANG_WARN_EMPTY_BODY = YES;
420422
CLANG_WARN_ENUM_CONVERSION = YES;
421423
CLANG_WARN_INFINITE_RECURSION = YES;
422424
CLANG_WARN_INT_CONVERSION = YES;
425+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
426+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
423427
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
428+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
429+
CLANG_WARN_STRICT_PROTOTYPES = YES;
424430
CLANG_WARN_SUSPICIOUS_MOVE = YES;
425431
CLANG_WARN_UNREACHABLE_CODE = YES;
426432
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -448,6 +454,7 @@
448454
ONLY_ACTIVE_ARCH = YES;
449455
SDKROOT = iphoneos;
450456
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
457+
SWIFT_VERSION = 4.0;
451458
};
452459
name = Debug;
453460
};
@@ -459,14 +466,20 @@
459466
CLANG_CXX_LIBRARY = "libc++";
460467
CLANG_ENABLE_MODULES = YES;
461468
CLANG_ENABLE_OBJC_ARC = YES;
469+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
462470
CLANG_WARN_BOOL_CONVERSION = YES;
471+
CLANG_WARN_COMMA = YES;
463472
CLANG_WARN_CONSTANT_CONVERSION = YES;
464473
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
465474
CLANG_WARN_EMPTY_BODY = YES;
466475
CLANG_WARN_ENUM_CONVERSION = YES;
467476
CLANG_WARN_INFINITE_RECURSION = YES;
468477
CLANG_WARN_INT_CONVERSION = YES;
478+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
479+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
469480
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
481+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
482+
CLANG_WARN_STRICT_PROTOTYPES = YES;
470483
CLANG_WARN_SUSPICIOUS_MOVE = YES;
471484
CLANG_WARN_UNREACHABLE_CODE = YES;
472485
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -486,6 +499,7 @@
486499
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
487500
MTL_ENABLE_DEBUG_INFO = NO;
488501
SDKROOT = iphoneos;
502+
SWIFT_VERSION = 4.0;
489503
VALIDATE_PRODUCT = YES;
490504
};
491505
name = Release;
@@ -501,7 +515,7 @@
501515
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
502516
PRODUCT_BUNDLE_IDENTIFIER = at.allaboutapps.Example;
503517
PRODUCT_NAME = "$(TARGET_NAME)";
504-
SWIFT_VERSION = 3.0;
518+
SWIFT_VERSION = 4.0;
505519
};
506520
name = Debug;
507521
};
@@ -517,7 +531,7 @@
517531
PRODUCT_BUNDLE_IDENTIFIER = at.allaboutapps.Example;
518532
PRODUCT_NAME = "$(TARGET_NAME)";
519533
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
520-
SWIFT_VERSION = 3.0;
534+
SWIFT_VERSION = 4.0;
521535
};
522536
name = Release;
523537
};
@@ -538,7 +552,7 @@
538552
PRODUCT_NAME = "$(TARGET_NAME)";
539553
SKIP_INSTALL = YES;
540554
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
541-
SWIFT_VERSION = 3.0;
555+
SWIFT_VERSION = 4.0;
542556
TARGETED_DEVICE_FAMILY = "1,2";
543557
VERSIONING_SYSTEM = "apple-generic";
544558
VERSION_INFO_PREFIX = "";
@@ -562,7 +576,7 @@
562576
PRODUCT_NAME = "$(TARGET_NAME)";
563577
SKIP_INSTALL = YES;
564578
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
565-
SWIFT_VERSION = 3.0;
579+
SWIFT_VERSION = 4.0;
566580
TARGETED_DEVICE_FAMILY = "1,2";
567581
VERSIONING_SYSTEM = "apple-generic";
568582
VERSION_INFO_PREFIX = "";
@@ -576,7 +590,7 @@
576590
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
577591
PRODUCT_BUNDLE_IDENTIFIER = at.allaboutapps.DataSourceTests;
578592
PRODUCT_NAME = "$(TARGET_NAME)";
579-
SWIFT_VERSION = 3.0;
593+
SWIFT_VERSION = 4.0;
580594
};
581595
name = Debug;
582596
};
@@ -588,7 +602,7 @@
588602
PRODUCT_BUNDLE_IDENTIFIER = at.allaboutapps.DataSourceTests;
589603
PRODUCT_NAME = "$(TARGET_NAME)";
590604
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
591-
SWIFT_VERSION = 3.0;
605+
SWIFT_VERSION = 4.0;
592606
};
593607
name = Release;
594608
};

Diff for: ‎Example.xcodeproj/xcshareddata/xcschemes/DataSource.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

Diff for: ‎Example.xcodeproj/xcshareddata/xcschemes/DataSourceTests.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

Diff for: ‎Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -65,6 +66,7 @@
6566
buildConfiguration = "Debug"
6667
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6768
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69+
language = ""
6870
launchStyle = "0"
6971
useCustomWorkingDirectory = "NO"
7072
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)