Skip to content

Commit 11105e2

Browse files
committed
Fix swift4 for xcode9 warnings
1 parent 41559ba commit 11105e2

File tree

3 files changed

+28
-8
lines changed

3 files changed

+28
-8
lines changed

Project/EnumListProject.xcodeproj/project.pbxproj

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,17 @@
200200
isa = PBXProject;
201201
attributes = {
202202
LastSwiftUpdateCheck = 0830;
203-
LastUpgradeCheck = 0830;
203+
LastUpgradeCheck = 0900;
204204
ORGANIZATIONNAME = "Bartosz Polaczyk";
205205
TargetAttributes = {
206206
10005CC31F3F00F100DFB92D = {
207207
CreatedOnToolsVersion = 8.3.2;
208+
LastSwiftMigration = 0900;
208209
ProvisioningStyle = Automatic;
209210
};
210211
10005CD71F3F00F200DFB92D = {
211212
CreatedOnToolsVersion = 8.3.2;
213+
LastSwiftMigration = 0900;
212214
ProvisioningStyle = Automatic;
213215
TestTargetID = 10005CC31F3F00F100DFB92D;
214216
};
@@ -418,15 +420,21 @@
418420
CLANG_CXX_LIBRARY = "libc++";
419421
CLANG_ENABLE_MODULES = YES;
420422
CLANG_ENABLE_OBJC_ARC = YES;
423+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
421424
CLANG_WARN_BOOL_CONVERSION = YES;
425+
CLANG_WARN_COMMA = YES;
422426
CLANG_WARN_CONSTANT_CONVERSION = YES;
423427
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
424428
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
425429
CLANG_WARN_EMPTY_BODY = YES;
426430
CLANG_WARN_ENUM_CONVERSION = YES;
427431
CLANG_WARN_INFINITE_RECURSION = YES;
428432
CLANG_WARN_INT_CONVERSION = YES;
433+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
434+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
429435
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
436+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
437+
CLANG_WARN_STRICT_PROTOTYPES = YES;
430438
CLANG_WARN_SUSPICIOUS_MOVE = YES;
431439
CLANG_WARN_UNREACHABLE_CODE = YES;
432440
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -469,15 +477,21 @@
469477
CLANG_CXX_LIBRARY = "libc++";
470478
CLANG_ENABLE_MODULES = YES;
471479
CLANG_ENABLE_OBJC_ARC = YES;
480+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
472481
CLANG_WARN_BOOL_CONVERSION = YES;
482+
CLANG_WARN_COMMA = YES;
473483
CLANG_WARN_CONSTANT_CONVERSION = YES;
474484
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
475485
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
476486
CLANG_WARN_EMPTY_BODY = YES;
477487
CLANG_WARN_ENUM_CONVERSION = YES;
478488
CLANG_WARN_INFINITE_RECURSION = YES;
479489
CLANG_WARN_INT_CONVERSION = YES;
490+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
491+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
480492
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
493+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
494+
CLANG_WARN_STRICT_PROTOTYPES = YES;
481495
CLANG_WARN_SUSPICIOUS_MOVE = YES;
482496
CLANG_WARN_UNREACHABLE_CODE = YES;
483497
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -513,7 +527,8 @@
513527
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
514528
PRODUCT_BUNDLE_IDENTIFIER = com.polaczyk.EnumListProject;
515529
PRODUCT_NAME = "$(TARGET_NAME)";
516-
SWIFT_VERSION = 3.0;
530+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
531+
SWIFT_VERSION = 4.0;
517532
};
518533
name = Debug;
519534
};
@@ -527,7 +542,8 @@
527542
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
528543
PRODUCT_BUNDLE_IDENTIFIER = com.polaczyk.EnumListProject;
529544
PRODUCT_NAME = "$(TARGET_NAME)";
530-
SWIFT_VERSION = 3.0;
545+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
546+
SWIFT_VERSION = 4.0;
531547
};
532548
name = Release;
533549
};
@@ -541,7 +557,8 @@
541557
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
542558
PRODUCT_BUNDLE_IDENTIFIER = com.polaczyk.EnumListProjectTests;
543559
PRODUCT_NAME = "$(TARGET_NAME)";
544-
SWIFT_VERSION = 3.0;
560+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
561+
SWIFT_VERSION = 4.0;
545562
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EnumListProject.app/EnumListProject";
546563
};
547564
name = Debug;
@@ -556,7 +573,8 @@
556573
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
557574
PRODUCT_BUNDLE_IDENTIFIER = com.polaczyk.EnumListProjectTests;
558575
PRODUCT_NAME = "$(TARGET_NAME)";
559-
SWIFT_VERSION = 3.0;
576+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
577+
SWIFT_VERSION = 4.0;
560578
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EnumListProject.app/EnumListProject";
561579
};
562580
name = Release;

Project/EnumListProject.xcodeproj/xcshareddata/xcschemes/EnumListProject.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
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"

Sources/APIConvenience.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import Foundation
1010

1111

1212
public extension RawRepresentable{
13-
init?<T>(raw rawValue: String) where RawValue == EnumListStringRaw<T>, T:StringEnumValues{
13+
init?<T>(raw rawValue: String) where RawValue == EnumListStringRaw<T>{
1414
self.init(rawValue: RawValue(stringLiteral: rawValue))
1515
}
1616
}
1717
public extension RawRepresentable{
18-
init?<T>(raw rawValue: Int) where RawValue == EnumListIntRaw<T>, T:IntEnumValues{
18+
init?<T>(raw rawValue: Int) where RawValue == EnumListIntRaw<T>{
1919
self.init(rawValue: EnumListIntRaw<T>(integerLiteral: rawValue))
2020
}
2121
}

0 commit comments

Comments
 (0)