Updated project for Xcode 9.3 w/Swift 4.1

nmdias · Apr 27, 2018 · 953754e · 953754e
1 parent 8640db4
commit 953754e
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 36 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.3
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
@@ -18,7 +18,7 @@ env:
   matrix:
     - DESTINATION="OS=9.0,name=iPhone 5"            SCHEME="$FRAMEWORK_SCHEME_IOS"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" EXAMPLE_SCHEME="$EXAMPLE_SCHEME_IOS"   POD_LINT="YES" 
     - DESTINATION="OS=10.0,name=iPhone 7"           SCHEME="$FRAMEWORK_SCHEME_IOS"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" EXAMPLE_SCHEME="$EXAMPLE_SCHEME_IOS"   POD_LINT="NO"
-    - DESTINATION="OS=11.0,name=iPhone 8"           SCHEME="$FRAMEWORK_SCHEME_IOS"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" EXAMPLE_SCHEME="$EXAMPLE_SCHEME_IOS"   POD_LINT="NO"
+    - DESTINATION="OS=11.3,name=iPhone X"           SCHEME="$FRAMEWORK_SCHEME_IOS"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" EXAMPLE_SCHEME="$EXAMPLE_SCHEME_IOS"   POD_LINT="NO"
     - DESTINATION="OS=2.0,name=Apple Watch - 42mm"  SCHEME="$FRAMEWORK_SCHEME_WATCHOS" RUN_TESTS="NO"  BUILD_EXAMPLE="NO"  EXAMPLE_SCHEME=""                      POD_LINT="NO"
     - DESTINATION="OS=9.0,name=Apple TV 1080p"      SCHEME="$FRAMEWORK_SCHEME_TVOS"    RUN_TESTS="YES" BUILD_EXAMPLE="YES" EXAMPLE_SCHEME="$EXAMPLE_SCHEME_TVOS"  POD_LINT="NO"
     - DESTINATION="OS=10.0,name=Apple TV 1080p"     SCHEME="$FRAMEWORK_SCHEME_TVOS"    RUN_TESTS="YES" BUILD_EXAMPLE="YES" EXAMPLE_SCHEME="$EXAMPLE_SCHEME_TVOS"  POD_LINT="NO" 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Change Log
+## [7.1.0](https://github.com/nmdias/FeedParser/releases/tag/7.1.0)
+### Added
+- Support for Xcode 9.3 w/Swift 4.1
+
 ## [7.0.1](https://github.com/nmdias/FeedParser/releases/tag/7.0.1)
 ### Fixed
 - Fixed 'characters' is deprecated for Swift 4.0.2 #41

diff --git a/FeedKit.podspec b/FeedKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'FeedKit'
-  s.version = '7.0.1'
+  s.version = '7.1.0'
   s.license = 'MIT'
   s.summary = 'An RSS, Atom and JSON Feed parser written in Swift'
   s.homepage = 'https://github.com/nmdias/FeedKit'

diff --git a/FeedKit.xcodeproj/project.pbxproj b/FeedKit.xcodeproj/project.pbxproj
@@ -1358,7 +1358,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					A0370EB81CEF9D5A009583A3 = {
 						CreatedOnToolsVersion = 7.3.1;
@@ -2511,11 +2511,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -3044,11 +3046,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -3077,11 +3081,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;

diff --git a/FeedKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/FeedKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit Example iOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit Example iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit Example macOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit Example macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit Example tvOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit Example tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit iOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit macOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit tvOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit watchOS.xcscheme b/FeedKit.xcodeproj/xcshareddata/xcschemes/FeedKit watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![cocoapods compatible](https://img.shields.io/badge/cocoapods-compatible-brightgreen.svg)](https://cocoapods.org/pods/FeedKit)
 [![carthage compatible](https://img.shields.io/badge/carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage)
 [![language](https://img.shields.io/badge/spm-compatible-brightgreen.svg)](https://swift.org)
-[![swift](https://img.shields.io/badge/swift-4-orange.svg)](https://github.com/nmdias/DefaultsKit/releases)
+[![swift](https://img.shields.io/badge/swift-4.1-orange.svg)](https://github.com/nmdias/DefaultsKit/releases)
 
 ## Features
 
@@ -22,7 +22,7 @@
 
 ## Requirements
 
-![xcode](https://img.shields.io/badge/xcode-9.0%2b-lightgrey.svg)
+![xcode](https://img.shields.io/badge/xcode-9.3%2b-lightgrey.svg)
 ![ios](https://img.shields.io/badge/ios-8.0%2b-lightgrey.svg)
 ![tvos](https://img.shields.io/badge/tvos-9.0%2b-lightgrey.svg)
 ![watchos](https://img.shields.io/badge/watchos-2.0%2b-lightgrey.svg)

diff --git a/Sources/FeedKit/Models/JSON/JSONFeed.swift b/Sources/FeedKit/Models/JSON/JSONFeed.swift
@@ -135,7 +135,7 @@ extension JSONFeed {
         self.expired        = dictionary["expired"] as? Bool
 
         if let items = dictionary["items"] as? [[String: Any?]] {
-            self.items = items.flatMap({ (item) -> JSONFeedItem? in
+            self.items = items.compactMap({ (item) -> JSONFeedItem? in
                 return JSONFeedItem(dictionary: item)
             })
         }
@@ -145,12 +145,12 @@ extension JSONFeed {
         }
 
         if let hubs = dictionary["hubs"] as? [[String: Any?]] {
-            self.hubs = hubs.flatMap({ (hub) -> JSONFeedHub? in
+            self.hubs = hubs.compactMap({ (hub) -> JSONFeedHub? in
                 return JSONFeedHub(dictionary: hub)
             })
         }
 
-        let privateExtensionKeys = dictionary.keys.flatMap { (key) -> String? in
+        let privateExtensionKeys = dictionary.keys.compactMap { (key) -> String? in
             return key.hasPrefix("_") ? key : nil
         }
 

diff --git a/Sources/FeedKit/Models/JSON/JSONFeedItem.swift b/Sources/FeedKit/Models/JSON/JSONFeedItem.swift
@@ -144,12 +144,12 @@ extension JSONFeedItem {
         }
 
         if let attachments = dictionary["attachments"] as? [[String: Any?]] {
-            self.attachments = attachments.flatMap({ (attachment) -> JSONFeedAttachment? in
+            self.attachments = attachments.compactMap({ (attachment) -> JSONFeedAttachment? in
                 return JSONFeedAttachment(dictionary: attachment)
             })
         }
 
-        let privateExtensionKeys = dictionary.keys.flatMap { (key) -> String? in
+        let privateExtensionKeys = dictionary.keys.compactMap { (key) -> String? in
             return key.hasPrefix("_") ? key : nil
         }
 

diff --git a/Sources/FeedKit/Models/Namespaces/Media/MediaTag.swift b/Sources/FeedKit/Models/Namespaces/Media/MediaTag.swift
@@ -54,7 +54,7 @@ extension MediaTag {
 
     static func tagsFrom(string: String) -> [MediaTag]? {
 
-        return string.components(separatedBy: ",").flatMap({ (value) -> MediaTag? in
+        return string.components(separatedBy: ",").compactMap({ (value) -> MediaTag? in
 
             let mediaTag = MediaTag()
             let components = value.components(separatedBy: ":")

diff --git a/Tests/DateTests.swift b/Tests/DateTests.swift
@@ -132,7 +132,7 @@ class DateTests: BaseTestCase {
         ]
 
         // When
-        let dates = dateStrings.flatMap { (dateString) -> Date? in
+        let dates = dateStrings.compactMap { (dateString) -> Date? in
             return dateString.toDate(from: spec)
         }
 
@@ -161,7 +161,7 @@ class DateTests: BaseTestCase {
         ]
 
         // When
-        let dates = dateStrings.flatMap { (dateString) -> Date? in
+        let dates = dateStrings.compactMap { (dateString) -> Date? in
             return dateString.toDate(from: spec)
         }