Swift 5 (#90)

* Migrate project to Swift 5 * Fixes warning on tvOS framework * Update Travis Config * Fix macOS Test Target * Add missing failed-request-example
venmo · Mar 27, 2019 · e0f5d34 · e0f5d34
1 parent 5875e4a
commit e0f5d34
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 79 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,21 @@
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10.2
 xcode_project: DVR.xcodeproj
 
 matrix:
   include:
     - xcode_scheme: DVR-iOS
       xcode_sdk: iphonesimulator
       env:
-        - DESTINATION="iOS Simulator,OS=11.4,name=iPhone X"
+        - DESTINATION="iOS Simulator,OS=12.2,name=iPhone X"
     - xcode_scheme: DVR-macOS
       xcode_sdk: macosx
       env:
         - DESTINATION="macOS,arch=x86_64"
     - xcode_scheme: DVR-tvOS
       xcode_sdk: appletvsimulator
       env:
-        - DESTINATION="tvOS Simulator,name=Apple TV 4K,OS=11.4"
+        - DESTINATION="tvOS Simulator,name=Apple TV 4K,OS=12.2"
     - env:
       - SWIFT_BUILD=true
 

diff --git a/DVR.xcodeproj/project.pbxproj b/DVR.xcodeproj/project.pbxproj
diff --git a/DVR.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DVR.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/DVR.xcodeproj/xcshareddata/xcschemes/DVR-iOS.xcscheme b/DVR.xcodeproj/xcshareddata/xcschemes/DVR-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DVR.xcodeproj/xcshareddata/xcschemes/DVR-macOS.xcscheme b/DVR.xcodeproj/xcshareddata/xcschemes/DVR-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DVR.xcodeproj/xcshareddata/xcschemes/DVR-tvOS.xcscheme b/DVR.xcodeproj/xcshareddata/xcschemes/DVR-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Sources/DVR/Session.swift b/Sources/DVR/Session.swift
@@ -126,7 +126,7 @@ open class Session: URLSession {
     func finishTask(_ task: URLSessionTask, interaction: Interaction, playback: Bool) {
         needsPersistence = needsPersistence || !playback
 
-        if let index = outstandingTasks.index(of: task) {
+        if let index = outstandingTasks.firstIndex(of: task) {
             outstandingTasks.remove(at: index)
         }