From c46016e4ca95a06f270e0cd11439b22120519a28 Mon Sep 17 00:00:00 2001 From: Fernando Paredes Date: Thu, 28 Mar 2019 09:02:42 -0400 Subject: [PATCH 1/2] Upgrade to Swift 5 --- Notice.xcodeproj/project.pbxproj | 23 +++++++++---------- .../xcshareddata/xcschemes/Notice.xcscheme | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Notice.xcodeproj/project.pbxproj b/Notice.xcodeproj/project.pbxproj index e480c7e..d770864 100644 --- a/Notice.xcodeproj/project.pbxproj +++ b/Notice.xcodeproj/project.pbxproj @@ -149,26 +149,27 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Mark Adams"; TargetAttributes = { 26BD50FE1CA331BC009408FE = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; 396F33611BB3461F00792AB5 = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; }; buildConfigurationList = 396F335C1BB3461F00792AB5 /* Build configuration list for PBXProject "Notice" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 396F33581BB3461F00792AB5; productRefGroup = 396F33631BB3461F00792AB5 /* Products */; @@ -235,8 +236,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.markadams.NoticeTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -248,8 +248,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.markadams.NoticeTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -257,6 +256,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -315,6 +315,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -383,8 +384,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -408,8 +408,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Notice.xcodeproj/xcshareddata/xcschemes/Notice.xcscheme b/Notice.xcodeproj/xcshareddata/xcschemes/Notice.xcscheme index c9e5c0a..7e604b7 100644 --- a/Notice.xcodeproj/xcshareddata/xcschemes/Notice.xcscheme +++ b/Notice.xcodeproj/xcshareddata/xcschemes/Notice.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 28 Mar 2019 09:03:59 -0400 Subject: [PATCH 2/2] Update Hashable Conformance --- Notice/Subscription.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Notice/Subscription.swift b/Notice/Subscription.swift index 55f29fa..00d53e4 100644 --- a/Notice/Subscription.swift +++ b/Notice/Subscription.swift @@ -16,8 +16,8 @@ public struct Subscription: Hashable { self.send = send } - public var hashValue: Int { - return uuid.hashValue + public func hash(into hasher: inout Hasher) { + hasher.combine(uuid) } public static func ==(lhs: Subscription, rhs: Subscription) -> Bool {