Skip to content

Commit 7e65a06

Browse files
RevolucentRevolucent
committed
Upgraded to Swift4
1 parent fdec67e commit 7e65a06

File tree

6 files changed

+37
-10
lines changed

6 files changed

+37
-10
lines changed

‎CoreDataQueryInterface.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
isa = PBXProject;
504504
attributes = {
505505
LastSwiftUpdateCheck = 0730;
506-
LastUpgradeCheck = 0800;
506+
LastUpgradeCheck = 0900;
507507
ORGANIZATIONNAME = "Prosumma LLC";
508508
TargetAttributes = {
509509
F30D1CC91B2A891100AF80A1 = {
@@ -523,10 +523,11 @@
523523
};
524524
F37C46A11B2A780200B35B1B = {
525525
CreatedOnToolsVersion = 7.0;
526-
LastSwiftMigration = 0800;
526+
LastSwiftMigration = 0900;
527527
};
528528
F37C46AB1B2A780200B35B1B = {
529529
CreatedOnToolsVersion = 7.0;
530+
LastSwiftMigration = 0900;
530531
};
531532
F3F1BC521CD0020100F9072D = {
532533
CreatedOnToolsVersion = 7.3;
@@ -937,14 +938,20 @@
937938
CLANG_CXX_LIBRARY = "libc++";
938939
CLANG_ENABLE_MODULES = YES;
939940
CLANG_ENABLE_OBJC_ARC = YES;
941+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
940942
CLANG_WARN_BOOL_CONVERSION = YES;
943+
CLANG_WARN_COMMA = YES;
941944
CLANG_WARN_CONSTANT_CONVERSION = YES;
942945
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
943946
CLANG_WARN_EMPTY_BODY = YES;
944947
CLANG_WARN_ENUM_CONVERSION = YES;
945948
CLANG_WARN_INFINITE_RECURSION = YES;
946949
CLANG_WARN_INT_CONVERSION = YES;
950+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
951+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
947952
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
953+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
954+
CLANG_WARN_STRICT_PROTOTYPES = YES;
948955
CLANG_WARN_SUSPICIOUS_MOVE = YES;
949956
CLANG_WARN_UNREACHABLE_CODE = YES;
950957
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -990,14 +997,20 @@
990997
CLANG_CXX_LIBRARY = "libc++";
991998
CLANG_ENABLE_MODULES = YES;
992999
CLANG_ENABLE_OBJC_ARC = YES;
1000+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
9931001
CLANG_WARN_BOOL_CONVERSION = YES;
1002+
CLANG_WARN_COMMA = YES;
9941003
CLANG_WARN_CONSTANT_CONVERSION = YES;
9951004
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
9961005
CLANG_WARN_EMPTY_BODY = YES;
9971006
CLANG_WARN_ENUM_CONVERSION = YES;
9981007
CLANG_WARN_INFINITE_RECURSION = YES;
9991008
CLANG_WARN_INT_CONVERSION = YES;
1009+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1010+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10001011
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1012+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1013+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10011014
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10021015
CLANG_WARN_UNREACHABLE_CODE = YES;
10031016
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1046,7 +1059,8 @@
10461059
PRODUCT_NAME = CoreDataQueryInterface;
10471060
SKIP_INSTALL = YES;
10481061
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1049-
SWIFT_VERSION = 3.0;
1062+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1063+
SWIFT_VERSION = 4.0;
10501064
};
10511065
name = Debug;
10521066
};
@@ -1066,7 +1080,8 @@
10661080
PRODUCT_BUNDLE_IDENTIFIER = com.prosumma.CoreDataQueryInterface;
10671081
PRODUCT_NAME = CoreDataQueryInterface;
10681082
SKIP_INSTALL = YES;
1069-
SWIFT_VERSION = 3.0;
1083+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1084+
SWIFT_VERSION = 4.0;
10701085
};
10711086
name = Release;
10721087
};
@@ -1080,6 +1095,8 @@
10801095
PRODUCT_BUNDLE_IDENTIFIER = com.prosumma.CoreDataQueryInterfaceTests;
10811096
PRODUCT_MODULE_NAME = CoreDataQueryInterfaceTests;
10821097
PRODUCT_NAME = "$(TARGET_NAME)";
1098+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1099+
SWIFT_VERSION = 4.0;
10831100
};
10841101
name = Debug;
10851102
};
@@ -1093,6 +1110,8 @@
10931110
PRODUCT_BUNDLE_IDENTIFIER = com.prosumma.CoreDataQueryInterfaceTests;
10941111
PRODUCT_MODULE_NAME = CoreDataQueryInterfaceTests;
10951112
PRODUCT_NAME = "$(TARGET_NAME)";
1113+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1114+
SWIFT_VERSION = 4.0;
10961115
};
10971116
name = Release;
10981117
};

‎CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface OSX.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 = "0800"
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 = "NO"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -74,6 +75,7 @@
7475
buildConfiguration = "Debug"
7576
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7677
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
78+
language = ""
7779
launchStyle = "0"
7880
useCustomWorkingDirectory = "NO"
7981
ignoresPersistentStateOnLaunch = "NO"

‎CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface iOS.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 = "0800"
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 = "NO"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -71,6 +72,7 @@
7172
buildConfiguration = "Debug"
7273
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7374
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
75+
language = ""
7476
launchStyle = "0"
7577
useCustomWorkingDirectory = "NO"
7678
ignoresPersistentStateOnLaunch = "NO"

‎CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface tvOS.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 = "0800"
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"

‎CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface watchOS.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 = "0800"
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
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎CoreDataQueryInterface/Miscellanea.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public func alias(_ expression: KeyPathExpressionConvertible, type: NSAttributeT
2929
return alias(expression, name: expression.cdqiName, type: type)
3030
}
3131

32-
public func subquery<E: EntityAttribute>(_ items: E, _ query: (E) -> NSPredicate) -> ExpressionConvertible where E: ExpressionConvertible {
32+
public func subquery<E: EntityAttribute>(_ items: E, _ query: (E) -> NSPredicate) -> ExpressionConvertible {
3333
let uuid = NSUUID().uuidString
3434
let index = uuid.index(uuid.startIndex, offsetBy: 6)
3535
let randomString = uuid.substring(to: index)
3636
let variable = "v\(randomString)"
3737
return NSExpression(forSubquery: items.cdqiExpression, usingIteratorVariable: variable, predicate: query(E(variable: variable)))
3838
}
3939

40-
public func subqueryCount<E: EntityAttribute>(_ items: E, _ query: (E) -> NSPredicate) -> FunctionExpression where E: ExpressionConvertible {
40+
public func subqueryCount<E: EntityAttribute>(_ items: E, _ query: (E) -> NSPredicate) -> FunctionExpression {
4141
return count(subquery(items, query))
4242
}

0 commit comments

Comments
 (0)