From 1c6f7fbd7c340ce1a10ddbc43853f6ed1da3fb74 Mon Sep 17 00:00:00 2001 From: Van Le Nguyen Date: Wed, 8 Aug 2018 17:00:45 -0400 Subject: [PATCH] Point VimeoNetworking to its `develop` branch --- .../AppIcon.appiconset/Contents.json | 5 +++++ Podfile | 6 +++--- Podfile.lock | 12 ++++++------ Pods/Local Podspecs/VimeoNetworking.podspec.json | 7 ++++--- Pods/Manifest.lock | 12 ++++++------ .../VimeoNetworking/Info.plist | 2 +- Pods/VimeoNetworking/README.md | 12 ++++++------ .../VimeoNetworking/Sources/AccountStore.swift | 4 ++-- .../Sources/AuthenticationController.swift | 6 +++--- .../VimeoNetworking/Sources/KeychainStore.swift | 2 +- .../Sources/Models/VIMLiveChatUser.swift | 2 +- .../VimeoNetworking/Sources/Models/VIMUser.h | 4 +++- .../VimeoNetworking/Sources/Models/VIMUser.m | 14 ++++++++++++++ .../VimeoNetworking/Sources/Models/VIMUserBadge.h | 4 +++- .../VimeoNetworking/Sources/Models/VIMUserBadge.m | 5 +++++ .../VimeoNetworking/Sources/Models/VIMVideo.h | 4 +++- .../VimeoNetworking/Sources/Models/VIMVideo.m | 12 ++++++++++++ .../Sources/Request+Authentication.swift | 2 +- .../VimeoNetworking/Sources/Request+Cache.swift | 2 +- .../Sources/Request+Notifications.swift | 2 +- .../VimeoNetworking/Sources/Request+Picture.swift | 2 +- .../VimeoNetworking/Sources/Request+Trigger.swift | 2 +- .../VimeoNetworking/Sources/Request+Video.swift | 2 +- .../VimeoNetworking/Sources/Response.swift | 2 +- .../VimeoNetworking/Sources/ResponseCache.swift | 8 ++++---- .../VimeoNetworking/Sources/Result.swift | 2 +- .../VimeoNetworking/Sources/VimeoClient.swift | 4 ++-- .../Sources/VimeoRequestSerializer.swift | 6 +++--- .../Sources/VimeoSessionManager.swift | 4 ++-- 29 files changed, 97 insertions(+), 54 deletions(-) diff --git a/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index b8236c65..19882d56 100644 --- a/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -39,6 +39,11 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/Podfile b/Podfile index 83c51829..edefcd46 100644 --- a/Podfile +++ b/Podfile @@ -6,14 +6,14 @@ project 'Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj' target 'VimeoUpload' do platform :ios, '8.0' use_frameworks! - pod 'VimeoNetworking', :git => 'git@github.com:vimeo/VimeoNetworking.git', :branch => 'feature/VIM-5876-Share-Extension' + pod 'VimeoNetworking', :git => 'git@github.com:vimeo/VimeoNetworking.git', :branch => 'develop' project 'Framework/VimeoUpload/VimeoUpload.xcodeproj' end target :'VimeoUpload-iOS' do platform :ios, '8.0' use_frameworks! - pod 'VimeoNetworking', :git => 'git@github.com:vimeo/VimeoNetworking.git', :branch => 'feature/VIM-5876-Share-Extension' + pod 'VimeoNetworking', :git => 'git@github.com:vimeo/VimeoNetworking.git', :branch => 'develop' project 'Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj' target "VimeoUpload-iOSTests" do @@ -24,7 +24,7 @@ end target :'VimeoUpload-iOS-OldUpload' do platform :ios, '8.0' use_frameworks! - pod 'VimeoNetworking', :git => 'git@github.com:vimeo/VimeoNetworking.git', :branch => 'feature/VIM-5876-Share-Extension' + pod 'VimeoNetworking', :git => 'git@github.com:vimeo/VimeoNetworking.git', :branch => 'develop' project 'Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj' target "VimeoUpload-iOS-OldUploadTests" do diff --git a/Podfile.lock b/Podfile.lock index a3138311..9d6bfc1a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,11 +14,11 @@ PODS: - AFNetworking/Serialization (3.1.0) - AFNetworking/UIKit (3.1.0): - AFNetworking/NSURLSession - - VimeoNetworking (3.1.0): + - VimeoNetworking (3.2.0): - AFNetworking (= 3.1.0) DEPENDENCIES: - - "VimeoNetworking (from `git@github.com:vimeo/VimeoNetworking.git`, branch `feature/VIM-5876-Share-Extension`)" + - "VimeoNetworking (from `git@github.com:vimeo/VimeoNetworking.git`, branch `develop`)" SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -26,18 +26,18 @@ SPEC REPOS: EXTERNAL SOURCES: VimeoNetworking: - :branch: feature/VIM-5876-Share-Extension + :branch: develop :git: "git@github.com:vimeo/VimeoNetworking.git" CHECKOUT OPTIONS: VimeoNetworking: - :commit: dccd197b269764e1e42b3377d083391d8746bcbb + :commit: 395710a68cb5c81a2089de94fb3b7fe28bf4c210 :git: "git@github.com:vimeo/VimeoNetworking.git" SPEC CHECKSUMS: AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 - VimeoNetworking: 64fe0a9f12d106c2fe1c54f4114b25a80931bf37 + VimeoNetworking: cef00b867495a61e9b5e10f5a6b309d82a200c02 -PODFILE CHECKSUM: b99f0640652fedc418368de2440c51afd1125a48 +PODFILE CHECKSUM: dd1c01077873d3593d24f554a22b00f665c04b49 COCOAPODS: 1.5.2 diff --git a/Pods/Local Podspecs/VimeoNetworking.podspec.json b/Pods/Local Podspecs/VimeoNetworking.podspec.json index c44c916a..070b7942 100644 --- a/Pods/Local Podspecs/VimeoNetworking.podspec.json +++ b/Pods/Local Podspecs/VimeoNetworking.podspec.json @@ -1,6 +1,6 @@ { "name": "VimeoNetworking", - "version": "3.1.0", + "version": "3.2.0", "summary": "A library for interacting with the Vimeo API.", "description": "An iOS/tvOS library for interacting with the Vimeo API.", "homepage": "https://github.com/vimeo/VimeoNetworking", @@ -14,7 +14,8 @@ "Mike Westendorf": "mikew@vimeo.com", "Jason Hawkins": "jasonh@vimeo.com", "Jennifer Lim": "jennifer@vimeo.com", - "Van Nguyen": "van@vimeo.com" + "Van Nguyen": "van@vimeo.com", + "Freddy Kellison-Linn": "freddyk@vimeo.com>" }, "social_media_url": "http://twitter.com/vimeo", "platforms": { @@ -24,7 +25,7 @@ "requires_arc": true, "source": { "git": "https://github.com/vimeo/VimeoNetworking.git", - "tag": "3.1.0" + "tag": "3.2.0" }, "source_files": "VimeoNetworking/Sources/**/*.{h,m,swift}", "resources": "VimeoNetworking/Resources/**/*.*", diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index a3138311..9d6bfc1a 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -14,11 +14,11 @@ PODS: - AFNetworking/Serialization (3.1.0) - AFNetworking/UIKit (3.1.0): - AFNetworking/NSURLSession - - VimeoNetworking (3.1.0): + - VimeoNetworking (3.2.0): - AFNetworking (= 3.1.0) DEPENDENCIES: - - "VimeoNetworking (from `git@github.com:vimeo/VimeoNetworking.git`, branch `feature/VIM-5876-Share-Extension`)" + - "VimeoNetworking (from `git@github.com:vimeo/VimeoNetworking.git`, branch `develop`)" SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -26,18 +26,18 @@ SPEC REPOS: EXTERNAL SOURCES: VimeoNetworking: - :branch: feature/VIM-5876-Share-Extension + :branch: develop :git: "git@github.com:vimeo/VimeoNetworking.git" CHECKOUT OPTIONS: VimeoNetworking: - :commit: dccd197b269764e1e42b3377d083391d8746bcbb + :commit: 395710a68cb5c81a2089de94fb3b7fe28bf4c210 :git: "git@github.com:vimeo/VimeoNetworking.git" SPEC CHECKSUMS: AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 - VimeoNetworking: 64fe0a9f12d106c2fe1c54f4114b25a80931bf37 + VimeoNetworking: cef00b867495a61e9b5e10f5a6b309d82a200c02 -PODFILE CHECKSUM: b99f0640652fedc418368de2440c51afd1125a48 +PODFILE CHECKSUM: dd1c01077873d3593d24f554a22b00f665c04b49 COCOAPODS: 1.5.2 diff --git a/Pods/Target Support Files/VimeoNetworking/Info.plist b/Pods/Target Support Files/VimeoNetworking/Info.plist index 90db36aa..9ae03a0c 100644 --- a/Pods/Target Support Files/VimeoNetworking/Info.plist +++ b/Pods/Target Support Files/VimeoNetworking/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.0 + 3.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/Pods/VimeoNetworking/README.md b/Pods/VimeoNetworking/README.md index fef1f9df..dc46d332 100644 --- a/Pods/VimeoNetworking/README.md +++ b/Pods/VimeoNetworking/README.md @@ -10,18 +10,18 @@ - tvOS (9.0+) ## Installing -At this stage of development VimeoNetworking is not yet available as a CocoaPod via the public Podspecs repo. For now we recommend including it in your project as a submodule. If you'd still like to work with VimeoNetworking as a development pod, simply configure your Podfile as shown below. - -To get started integrating `VimeoNetworking`, add the following lines to your `Podfile` and run `pod install`: +To get started add the following to your Podfile: ```Ruby -use_frameworks! # required for Swift frameworks +use_frameworks! -target 'YourAppTargetName' do - pod 'VimeoNetworking', :path => './Submodules/VimeoNetworking' +target 'YourTarget' do + pod 'VimeoNetworking' end ``` +You can optionally specify a version number, or point directly to our `develop` branch. Note that breaking changes may be introduced into `develop` at any time, but those changes will always be behind a major or minor release version number. + ## Initialization The first step towards using the Vimeo API is registering a new application on the Vimeo Developer site: [My API Apps](https://developer.vimeo.com/apps). You'll need a Vimeo account, if you don't already have one. diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/AccountStore.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/AccountStore.swift index b114da20..a4eeedc7 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/AccountStore.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/AccountStore.swift @@ -53,14 +53,14 @@ final class AccountStore } } - // MARK: - + // MARK: - private struct Constants { static let ErrorDomain = "AccountStoreErrorDomain" } - // MARK: - + // MARK: - private let keychainStore: KeychainStore diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift index 2aa2c443..82c908ff 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift @@ -27,9 +27,9 @@ import Foundation /** - `AuthenticationController` is used to authenticate a `VimeoClient` instance, either by loading an account stored in the system keychain, or by interacting with the Vimeo API to authenticate a new account. The two publicly accessible authentication methods are client credentials grant and code grant. + `AuthenticationController` is used to authenticate a `VimeoClient` instance, either by loading an account stored in the system keychain, or by interacting with the Vimeo API to authenticate a new account. The two publicly accessible authentication methods are client credentials grant and code grant. - Client credentials grant is a public authentication method with no logged in user, which allows your application to access anything a logged out user could see on Vimeo (public content). + Client credentials grant is a public authentication method with no logged in user, which allows your application to access anything a logged out user could see on Vimeo (public content). Code grant is a way of logging in with a user account, which can give your application access to that user's private content and permission to interact with Vimeo on their behalf. This is achieved by first opening a generated URL in Safari which presents a user log in page. When the user authenticates successfully, control is returned to your app through a redirect link, and you then make a final request to retrieve the authenticated account. @@ -358,7 +358,7 @@ final public class AuthenticationController /** **(PRIVATE: Vimeo Use Only, will not work for third-party applications)** - Exchange a saved access token granted to another application for a new token granted to the calling application. This method will allow an application to re-use credentials from another Vimeo application. Client credentials must be granted before using this method. + Exchange a saved access token granted to another application for a new token granted to the calling application. This method will allow an application to re-use credentials from another Vimeo application. Client credentials must be granted before using this method. - parameter accessToken: access token granted to the other application - parameter completion: handler for authentication success or failure diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/KeychainStore.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/KeychainStore.swift index 67c2abc4..b6b246c3 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/KeychainStore.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/KeychainStore.swift @@ -119,7 +119,7 @@ final class KeychainStore } } - // MARK: - + // MARK: - private func query(for key: String) -> [String: Any] { diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMLiveChatUser.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMLiveChatUser.swift index a5c920c5..2f555db4 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMLiveChatUser.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMLiveChatUser.swift @@ -46,7 +46,7 @@ public enum AccountType: String /// An object representing the `user` field in a `chat` response. public class VIMLiveChatUser: VIMModelObject -{ +{ private struct Constants { static let PictureResponseKey = "pictures" diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h index 752cb024..647d4623 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h @@ -43,7 +43,9 @@ typedef NS_ENUM(NSInteger, VIMUserAccountType) VIMUserAccountTypeBusiness, VIMUserAccountTypeLivePro, VIMUserAccountTypeLiveBusiness, - VIMUserAccountTypeLivePremium + VIMUserAccountTypeLivePremium, + VIMUserAccountTypeProUnlimited, + VIMUserAccountTypeProducer }; @interface VIMUser : VIMModelObject diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m index d4469306..bba52257 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m @@ -41,6 +41,8 @@ static NSString *const LivePro = @"live_pro"; static NSString *const LiveBusiness = @"live_business"; static NSString *const LivePremium = @"live_premium"; +static NSString *const ProUnlimited = @"pro_unlimited"; +static NSString *const Producer = @"producer"; @interface VIMUser () @@ -240,6 +242,14 @@ - (void)parseAccountType { self.accountType = VIMUserAccountTypeLivePremium; } + else if ([self.account isEqualToString:ProUnlimited]) + { + self.accountType = VIMUserAccountTypeProUnlimited; + } + else if ([self.account isEqualToString:Producer]) + { + self.accountType = VIMUserAccountTypeProducer; + } } - (void)parseEmails @@ -308,6 +318,10 @@ - (NSString *)accountTypeAnalyticsIdentifier return LiveBusiness; case VIMUserAccountTypeLivePremium: return LivePremium; + case VIMUserAccountTypeProUnlimited: + return ProUnlimited; + case VIMUserAccountTypeProducer: + return Producer; } } diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.h b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.h index c7feb119..66083571 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.h +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.h @@ -30,6 +30,7 @@ typedef NS_ENUM(NSInteger, VIMUserBadgeType) { VIMUserBadgeTypeDefault = 0, VIMUserBadgeTypePlus, + // PRO and PRO Unlimited have the same BadgeType `PRO` [JL 07/18/2018] VIMUserBadgeTypePro, VIMUserBadgeTypeBusiness, VIMUserBadgeTypeLiveBusiness, @@ -37,7 +38,8 @@ typedef NS_ENUM(NSInteger, VIMUserBadgeType) VIMUserBadgeTypeAlum, VIMUserBadgeTypeStaff, VIMUserBadgeTypeSupport, - VIMUserBadgeTypeCuration + VIMUserBadgeTypeCuration, + VIMUserBadgeTypeProducer }; @interface VIMUserBadge : VIMModelObject diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.m index 3346836b..c1d8ca8e 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUserBadge.m @@ -37,6 +37,7 @@ @implementation VIMUserBadge static NSString *const Alum = @"alum"; static NSString *const LivePro = @"live_pro"; static NSString *const LiveBusiness = @"live_business"; +static NSString *const Producer = @"producer"; - (void)didFinishMapping { @@ -81,6 +82,10 @@ - (void)parseBadge { self.badgeType = VIMUserBadgeTypeLiveBusiness; } + else if ([self.type isEqualToString:Producer]) + { + self.badgeType = VIMUserBadgeTypeProducer; + } else { self.badgeType = VIMUserBadgeTypeDefault; diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.h b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.h index aad16e6b..643fb411 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.h +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.h @@ -55,7 +55,8 @@ typedef NS_ENUM(NSUInteger, VIMVideoProcessingStatus) { VIMVideoProcessingStatusTranscoding, VIMVideoProcessingStatusUploadingError, VIMVideoProcessingStatusTranscodingError, - VIMVideoProcessingStatusQuotaExceeded + VIMVideoProcessingStatusQuotaExceeded, + VIMVideoProcessingStatusTotalCapExceeded }; @interface VIMVideo : VIMModelObject @@ -168,5 +169,6 @@ typedef NS_ENUM(NSUInteger, VIMVideoProcessingStatus) { - (void)setIsLiked:(BOOL)isLiked; - (void)setIsWatchLater:(BOOL)isWatchLater; - (BOOL)hasReviewPage; +- (BOOL)canDownloadFromDesktop; @end diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m index c6a01f4f..3a80aacc 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m @@ -334,6 +334,7 @@ - (void)setVideoStatus [NSNumber numberWithInt:VIMVideoProcessingStatusUploadingError], @"uploading_error", [NSNumber numberWithInt:VIMVideoProcessingStatusTranscodingError], @"transcoding_error", [NSNumber numberWithInt:VIMVideoProcessingStatusQuotaExceeded], @"quota_exceeded", + [NSNumber numberWithInt:VIMVideoProcessingStatusTotalCapExceeded], @"total_cap_exceeded", nil]; NSNumber *number = [statusDictionary objectForKey:self.status]; @@ -554,4 +555,15 @@ - (BOOL)hasReviewPage trimmedReviewLink.length > 0; } +- (BOOL)canDownloadFromDesktop +{ + if ([self.privacy.canDownload respondsToSelector: @selector(boolValue)]) + { + return [self.privacy.canDownload boolValue]; + } + + NSAssert(false, @"`video.privacy.canDownload` is an unexpected type."); + return false; +} + @end diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Authentication.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Authentication.swift index ba28a149..7258710c 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Authentication.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Authentication.swift @@ -232,7 +232,7 @@ extension Request where ModelType: VIMNullResponse */ public static func resetPasswordRequest(withEmail email: String) -> Request { - let path = "/users/" + email + "/password/reset" + let path = "/users/\(email)/password/reset" return Request(method: .POST, path: path) } diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift index 68469636..9fa5047a 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift @@ -35,7 +35,7 @@ public extension Request let url = NSURL(string: self.path) let urlPath = url?.path ?? "" - var cacheKey = "cached" + urlPath + "." + String(self.path.hashValue) + var cacheKey = "cached\(urlPath).\(self.path.hashValue)" cacheKey = cacheKey.replacingOccurrences(of: "/", with: ".") return cacheKey diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Notifications.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Notifications.swift index 93727dec..8f8bb62a 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Notifications.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Notifications.swift @@ -51,7 +51,7 @@ public extension Request private static func subscriptionsURI(forNotificationsURI notificationsURI: String, deviceToken: String) -> String { - return notificationsURI + "/\(deviceToken)" + SubscriptionsPathComponent + return "\(notificationsURI)/\(deviceToken)\(SubscriptionsPathComponent)" } public static func markNotificationAsNotNewRequest(forNotification notification: VIMNotification, notificationsURI: String) -> Request diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Picture.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Picture.swift index 5d3c4d2a..e36776a9 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Picture.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Picture.swift @@ -20,7 +20,7 @@ public extension Request */ public static func createPictureRequest(forUserURI userURI: String) -> Request { - let uri = userURI + "/pictures" + let uri = "\(userURI)/pictures" return Request(method: .POST, path: uri) } diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Trigger.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Trigger.swift index a5f50f81..b10b26d7 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Trigger.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Trigger.swift @@ -92,6 +92,6 @@ extension Request { let deviceTypeIdentifier = UIDevice.current.userInterfaceIdiom == .phone ? "iphone" : "ipad" - return "me/devices/" + deviceTypeIdentifier + "/" + deviceToken + return "me/devices/\(deviceTypeIdentifier)/\(deviceToken)" } } diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Video.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Video.swift index 5fd4b7c2..b0527ec0 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Video.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Video.swift @@ -40,7 +40,7 @@ public extension Request private static var SelectedUsersPrivacyPath: String { return "/privacy/users" } - // MARK: - + // MARK: - /** Create a `Request` to get a specific video diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Response.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Response.swift index 1e4af85e..45de8d0f 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Response.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Response.swift @@ -61,7 +61,7 @@ import Foundation /// The request for the last page associated with this collection response, if one exists public let lastPageRequest: Request? - // MARK: - + // MARK: - /** Creates a new `Response` diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift index fce808f4..99b84d64 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift @@ -171,7 +171,7 @@ final public class ResponseCache let fileManager = FileManager() let directoryPath = self.cachesDirectoryURL().path - guard let filePath = self.fileURL(forKey: key)?.path else + guard let filePath = self.fileURL(forKey: key)?.path else { assertionFailure("No cache path found.") return @@ -195,7 +195,7 @@ final public class ResponseCache { print("ResponseDiskCache error: \(error)") } - }) + }) } func responseDictionary(forKey key: String, completion: @escaping (VimeoClient.ResponseDictionary?) -> Void) @@ -270,7 +270,7 @@ final public class ResponseCache { print("Removal of disk cache for \(key) failed with error \(error)") } - }) + }) } func removeAllResponseDictionaries() @@ -294,7 +294,7 @@ final public class ResponseCache { print("Could not clear disk cache.") } - }) + }) } // MARK: - directories diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Result.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Result.swift index 19592df8..266d871f 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Result.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Result.swift @@ -41,7 +41,7 @@ public enum Result case failure(error: NSError) } -/// `ResultCompletion` creates a generic typealias to generally define completion blocks that return a `Result` +/// `ResultCompletion` creates a generic typealias to generally define completion blocks that return a `Result` public enum ResultCompletion { public typealias T = (Result) -> Void diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift index 7573f6ae..41e82a65 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift @@ -27,12 +27,12 @@ import Foundation /// `VimeoClient` handles a rich assortment of functionality focused around interacting with the Vimeo API. A client object tracks an authenticated account, handles the low-level execution of requests through a session manager with caching functionality, presents a high-level `Request` and `Response` interface, and notifies of globally relevant events and errors through `Notification`s -/// +/// /// To start using a client, first instantiate an `AuthenticationController` to load a stored account or authenticate a new one. Next, create `Request` instances and pass them into the `request` function, which returns `Response`s on success. final public class VimeoClient { - // MARK: - + // MARK: - /// HTTP methods available for requests public enum Method: String diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoRequestSerializer.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoRequestSerializer.swift index 43b8c61c..605ed7c3 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoRequestSerializer.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoRequestSerializer.swift @@ -42,7 +42,7 @@ final public class VimeoRequestSerializer: AFJSONRequestSerializer public typealias AccessTokenProvider = () -> String? - // MARK: + // MARK: // for authenticated requests var accessTokenProvider: AccessTokenProvider? @@ -197,7 +197,7 @@ final public class VimeoRequestSerializer: AFJSONRequestSerializer guard let existingUserAgent = request.value(forHTTPHeaderField: Constants.UserAgentKey) else { // DISCUSSION: AFNetworking doesn't set a User Agent for tvOS (look at the init method in AFHTTPRequestSerializer.m). - // So, on tvOS the User Agent will only specify the framework. System information might be something we want to add + // So, on tvOS the User Agent will only specify the framework. System information might be something we want to add // in the future if AFNetworking isn't providing it. [ghking] 6/19/17 #if !os(tvOS) @@ -209,7 +209,7 @@ final public class VimeoRequestSerializer: AFJSONRequestSerializer return request } - let modifiedUserAgent = existingUserAgent + " " + frameworkString + let modifiedUserAgent = "\(existingUserAgent) \(frameworkString)" request.setValue(modifiedUserAgent, forHTTPHeaderField: Constants.UserAgentKey) diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift index 4abb51bb..fb649306 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift @@ -31,7 +31,7 @@ import AFNetworking /** `VimeoSessionManager` handles networking and serialization for raw HTTP requests. It is a direct subclass of `AFHTTPSessionManager` and it's designed to be used internally by `VimeoClient`. For the majority of purposes, it would be better to use `VimeoClient` and a `Request` object to better encapsulate this logic, since the latter provides richer functionality overall. */ final public class VimeoSessionManager: AFHTTPSessionManager -{ +{ // MARK: Initialization /** @@ -44,7 +44,7 @@ final public class VimeoSessionManager: AFHTTPSessionManager - returns: an initialized `VimeoSessionManager` */ required public init(baseUrl: URL, sessionConfiguration: URLSessionConfiguration, requestSerializer: VimeoRequestSerializer) - { + { super.init(baseURL: baseUrl, sessionConfiguration: sessionConfiguration) self.requestSerializer = requestSerializer