Skip to content

Commit 2552814

Browse files
author
Charlotte Tortorella
committed
Upgrade to Swift 5
1 parent 0de1a3f commit 2552814

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

ReactiveReSwift.xcodeproj/project.pbxproj

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
isa = PBXProject;
453453
attributes = {
454454
LastSwiftUpdateCheck = 0720;
455-
LastUpgradeCheck = 0940;
455+
LastUpgradeCheck = 1020;
456456
ORGANIZATIONNAME = "Benjamin Encz";
457457
TargetAttributes = {
458458
25DBCF361C30BF2B00D63A58 = {
@@ -474,18 +474,21 @@
474474
};
475475
625E66821C1FF97E0027C288 = {
476476
CreatedOnToolsVersion = 7.1.1;
477+
LastSwiftMigration = 1020;
477478
};
478479
625E66991C1FFA3C0027C288 = {
479480
CreatedOnToolsVersion = 7.1.1;
481+
LastSwiftMigration = 1020;
480482
};
481483
};
482484
};
483485
buildConfigurationList = 625E667D1C1FF97E0027C288 /* Build configuration list for PBXProject "ReactiveReSwift" */;
484486
compatibilityVersion = "Xcode 3.2";
485-
developmentRegion = English;
487+
developmentRegion = en;
486488
hasScannedForEncodings = 0;
487489
knownRegions = (
488490
en,
491+
Base,
489492
);
490493
mainGroup = 625E66791C1FF97E0027C288;
491494
productRefGroup = 625E66841C1FF97E0027C288 /* Products */;
@@ -908,6 +911,7 @@
908911
isa = XCBuildConfiguration;
909912
buildSettings = {
910913
ALWAYS_SEARCH_USER_PATHS = NO;
914+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
911915
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
912916
CLANG_CXX_LIBRARY = "libc++";
913917
CLANG_ENABLE_MODULES = YES;
@@ -975,6 +979,7 @@
975979
isa = XCBuildConfiguration;
976980
buildSettings = {
977981
ALWAYS_SEARCH_USER_PATHS = NO;
982+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
978983
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
979984
CLANG_CXX_LIBRARY = "libc++";
980985
CLANG_ENABLE_MODULES = YES;
@@ -1048,6 +1053,7 @@
10481053
PRODUCT_NAME = ReactiveReSwift;
10491054
SKIP_INSTALL = YES;
10501055
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1056+
SWIFT_VERSION = 5.0;
10511057
};
10521058
name = Debug;
10531059
};
@@ -1067,6 +1073,7 @@
10671073
PRODUCT_NAME = ReactiveReSwift;
10681074
SKIP_INSTALL = YES;
10691075
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1076+
SWIFT_VERSION = 5.0;
10701077
};
10711078
name = Release;
10721079
};
@@ -1080,6 +1087,7 @@
10801087
PRODUCT_NAME = "$(TARGET_NAME)";
10811088
SWIFT_OBJC_BRIDGING_HEADER = "";
10821089
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1090+
SWIFT_VERSION = 5.0;
10831091
};
10841092
name = Debug;
10851093
};
@@ -1092,6 +1100,7 @@
10921100
PRODUCT_BUNDLE_IDENTIFIER = reswift.github.io.ReactiveReSwift;
10931101
PRODUCT_NAME = "$(TARGET_NAME)";
10941102
SWIFT_OBJC_BRIDGING_HEADER = "";
1103+
SWIFT_VERSION = 5.0;
10951104
};
10961105
name = Release;
10971106
};

ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-iOS.xcscheme

Lines changed: 1 addition & 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 = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-macOS.xcscheme

Lines changed: 1 addition & 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 = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-tvOS.xcscheme

Lines changed: 1 addition & 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 = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-watchOS.xcscheme

Lines changed: 1 addition & 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 = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Sources/Reactive/ObservablePropertySubscriptionReference.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ extension ObservablePropertySubscriptionReference: SubscriptionReferenceType {
2626

2727
extension ObservablePropertySubscriptionReference: Equatable, Hashable {
2828
/// The hash of the subscription.
29-
public var hashValue: Int {
30-
return key.hash
29+
public func hash(into hasher: inout Hasher) {
30+
hasher.combine(key)
3131
}
32-
32+
3333
/// Compare two `ObservablePropertySubscriptionReference`s.
3434
public static func == <T>(lhs: ObservablePropertySubscriptionReference<T>, rhs: ObservablePropertySubscriptionReference<T>) -> Bool {
3535
return lhs.key == rhs.key

0 commit comments

Comments
 (0)