From 226addd0baf91e81d01163e1be6357a4f8ccc377 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 8 Jul 2017 13:10:55 -0700 Subject: [PATCH] Convert RSFeedFinder to Swift 4. --- .../RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj | 8 ++++---- Frameworks/RSFeedFinder/RSFeedFinder/FeedSpecifier.swift | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj b/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj index 765f5047d..2c945f5c9 100644 --- a/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj +++ b/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj @@ -311,6 +311,8 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -352,6 +354,8 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -374,7 +378,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -394,7 +397,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinder; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -408,7 +410,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -421,7 +422,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinderTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Frameworks/RSFeedFinder/RSFeedFinder/FeedSpecifier.swift b/Frameworks/RSFeedFinder/RSFeedFinder/FeedSpecifier.swift index b419619f6..710ae5939 100644 --- a/Frameworks/RSFeedFinder/RSFeedFinder/FeedSpecifier.swift +++ b/Frameworks/RSFeedFinder/RSFeedFinder/FeedSpecifier.swift @@ -75,7 +75,6 @@ public struct FeedSpecifier: Hashable { return currentBestFeed } - } private extension FeedSpecifier {