Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swift 5 #90

Merged
merged 6 commits into from
Mar 27, 2019
Merged

Swift 5 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e004401
Migrate to Swift 5
Mar 27, 2019
1076f89
Fix warning on tvOS framework
Mar 27, 2019
75aead0
[CI] Update Travis Config
Mar 27, 2019
c2a40f6
Fix macOS Test Target
Mar 27, 2019
3f3a0a0
Add missing failed-request-example
Mar 27, 2019
8a4dd47
Set Targeted Device Family for iOS
Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
149 changes: 77 additions & 72 deletions DVR.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions DVR.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion DVR.xcodeproj/xcshareddata/xcschemes/DVR-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion DVR.xcodeproj/xcshareddata/xcschemes/DVR-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion DVR.xcodeproj/xcshareddata/xcschemes/DVR-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Sources/DVR/Session.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down