diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3b72e3fd..290b93f9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,12 +1,38 @@ #### Ticket -**Required for Vimeans only** + [TICKET_NUMBER](https://vimean.atlassian.net/browse/TICKET_NUMBER) -#### Ticket Summary -A brief but thorough description of the ticket. +- *Note: this is required for Vimeo staff only. If not applicable to your PR, use "N/A".* + +#### Pull Request Checklist + +- [ ] Resolved any merge conflicts +- [ ] No build errors or warnings are introduced +- [ ] New files are written in Swift +- [ ] New classes contain license headers +- [ ] New classes have Documentation +- [ ] New public methods have Documentation + +#### Issue Summary + +- *Outline the goals of the PR in technical terms. If this branch fixes a bug, state what caused the bug.* #### Implementation Summary -A brief but thorough description of the changes put in place to address the ticket. + +- *Identify the core components that were added or changed, and briefly state the reasoning behind these changes.* + +- *List any key assumptions made.* + +#### Reviewer Tips + +- *Provide the order in which files or components should be reviewed.* + +- *List the general components that this PR will affect.* + +- *Identify any copy and pasted code with a large diff.* #### How to Test -Detailed *list* of what to test and how to test it. Including all edge cases. + +- *Identify necessary conditions for testing (e.g. logged out, bad connectivity).* + +- *If a special type of account is needed for log in, contact a developer privately to provide credentials.* diff --git a/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift index 3d94f9ff..e68e530d 100644 --- a/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift +++ b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift @@ -42,6 +42,16 @@ import VimeoUpload class VideoSettingsViewController: UIViewController, UITextFieldDelegate { + private struct Constants + { + struct TwoStepUploadPermissionAlert + { + static let Title = "Cannot Upload Video" + static let Message = "Check the project target to confirm you selected Old-Upload. New-Upload is not available to third-party apps yet." + static let ActionTitle = "OK" + } + } + static let UploadInitiatedNotification = "VideoSettingsViewControllerUploadInitiatedNotification" static let NibName = "VideoSettingsViewController" private static let PreUploadViewPrivacy = "pre_upload" @@ -285,12 +295,24 @@ class VideoSettingsViewController: UIViewController, UITextFieldDelegate private func applyVideoSettings() { - let videoUri = self.uploadTicket!.video!.uri! - let videoSettings = self.videoSettings! + guard let videoURI = self.uploadTicket?.video?.uri, let videoSettings = self.videoSettings else + { + let alertController = UIAlertController( + title: Constants.TwoStepUploadPermissionAlert.Title, + message: Constants.TwoStepUploadPermissionAlert.Message, + preferredStyle: .alert + ) + alertController.addAction(UIAlertAction(title: Constants.TwoStepUploadPermissionAlert.ActionTitle, style: .default, handler: { [weak self] (action) in + self?.activityIndicatorView.stopAnimating() + })) + self.present(alertController, animated: true, completion: nil) + + return + } do { - self.task = try NewVimeoUploader.sharedInstance.foregroundSessionManager.videoSettingsDataTask(videoUri: videoUri, videoSettings: videoSettings, completionHandler: { [weak self] (video, error) -> Void in + self.task = try NewVimeoUploader.sharedInstance.foregroundSessionManager.videoSettingsDataTask(videoUri: videoURI, videoSettings: videoSettings, completionHandler: { [weak self] (video, error) -> Void in self?.task = nil diff --git a/Gemfile b/Gemfile index c410c021..a9ce7092 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' gem 'fastlane', '2.42.0' -gem 'cocoapods', '1.1.1' +gem 'cocoapods', '1.2.0' gem 'xcode-install', '2.1.0' gem 'xcpretty-json-formatter', '0.1.0' gem 'danger-xcode_summary', '0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 90e21f95..429cbcd8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,25 +15,26 @@ GEM cork nap open4 (~> 1.3) - cocoapods (1.1.1) + cocoapods (1.2.0) activesupport (>= 4.0.2, < 5) claide (>= 1.0.1, < 2.0) - cocoapods-core (= 1.1.1) + cocoapods-core (= 1.2.0) cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.2, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.1.1, < 2.0) + cocoapods-trunk (>= 1.1.2, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored (~> 1.2) escape (~> 0.0.4) fourflusher (~> 2.0.1) gh_inspector (~> 1.0) - molinillo (~> 0.5.1) + molinillo (~> 0.5.5) nap (~> 1.0) - xcodeproj (>= 1.3.3, < 2.0) - cocoapods-core (1.1.1) + ruby-macho (~> 0.2.5) + xcodeproj (>= 1.4.1, < 2.0) + cocoapods-core (1.2.0) activesupport (>= 4.0.2, < 5) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -43,7 +44,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.0.0) - cocoapods-trunk (1.1.2) + cocoapods-trunk (1.2.0) nap (>= 0.8, < 2.0) netrc (= 0.7.8) cocoapods-try (1.1.0) @@ -160,7 +161,7 @@ GEM mini_magick (4.5.1) mini_portile2 (2.1.0) minitest (5.10.2) - molinillo (0.5.5) + molinillo (0.5.7) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -181,6 +182,7 @@ GEM uber (< 0.2.0) retriable (3.0.2) rouge (2.0.7) + ruby-macho (0.2.6) rubyzip (1.2.1) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) @@ -224,7 +226,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.1.1) + cocoapods (= 1.2.0) danger-xcode_summary (= 0.1.0) fastlane (= 2.42.0) fastlane-plugin-pretty_junit diff --git a/Podfile.lock b/Podfile.lock index 0bcd60c4..1555179d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -36,4 +36,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: dd1c01077873d3593d24f554a22b00f665c04b49 -COCOAPODS: 1.1.1 +COCOAPODS: 1.2.0 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 0bcd60c4..1555179d 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -36,4 +36,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: dd1c01077873d3593d24f554a22b00f665c04b49 -COCOAPODS: 1.1.1 +COCOAPODS: 1.2.0 diff --git a/Pods/Target Support Files/AFNetworking/AFNetworking-prefix.pch b/Pods/Target Support Files/AFNetworking/AFNetworking-prefix.pch index b52cf0d6..e72247a9 100644 --- a/Pods/Target Support Files/AFNetworking/AFNetworking-prefix.pch +++ b/Pods/Target Support Files/AFNetworking/AFNetworking-prefix.pch @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif #ifndef TARGET_OS_IOS diff --git a/Pods/Target Support Files/AFNetworking/AFNetworking-umbrella.h b/Pods/Target Support Files/AFNetworking/AFNetworking-umbrella.h index 39bdaa8d..073fc10e 100644 --- a/Pods/Target Support Files/AFNetworking/AFNetworking-umbrella.h +++ b/Pods/Target Support Files/AFNetworking/AFNetworking-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif #import "AFNetworking.h" diff --git a/Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig b/Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig index acd29b5a..03d5266e 100644 --- a/Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig +++ b/Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig @@ -5,5 +5,6 @@ OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -frame PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} +PODS_TARGET_SRCROOT = ${PODS_ROOT}/AFNetworking PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-frameworks.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-frameworks.sh index a61aa245..afd10b33 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-frameworks.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-frameworks.sh @@ -59,8 +59,13 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } @@ -91,3 +96,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "$BUILT_PRODUCTS_DIR/AFNetworking/AFNetworking.framework" install_framework "$BUILT_PRODUCTS_DIR/VimeoNetworking/VimeoNetworking.framework" fi +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-resources.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-resources.sh index 25e9d377..4602c68a 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-resources.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-resources.sh @@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 2) TARGET_DEVICE_ARGS="--target-device ipad" ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-umbrella.h b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-umbrella.h index 8b26217d..e1acfe66 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-umbrella.h +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-frameworks.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-frameworks.sh index 893c16a6..0f29f13c 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-frameworks.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-frameworks.sh @@ -59,8 +59,13 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } @@ -82,3 +87,6 @@ strip_invalid_archs() { fi } +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-resources.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-resources.sh index 25e9d377..4602c68a 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-resources.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-resources.sh @@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 2) TARGET_DEVICE_ARGS="--target-device ipad" ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-umbrella.h b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-umbrella.h index 48c1e88e..e0e8de0e 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-umbrella.h +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.debug.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.debug.xcconfig index 52520ee3..364177a7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.debug.xcconfig @@ -1,4 +1,3 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.release.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.release.xcconfig index 52520ee3..364177a7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.release.xcconfig @@ -1,4 +1,3 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-frameworks.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-frameworks.sh index a61aa245..afd10b33 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-frameworks.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-frameworks.sh @@ -59,8 +59,13 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } @@ -91,3 +96,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "$BUILT_PRODUCTS_DIR/AFNetworking/AFNetworking.framework" install_framework "$BUILT_PRODUCTS_DIR/VimeoNetworking/VimeoNetworking.framework" fi +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-resources.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-resources.sh index 25e9d377..4602c68a 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-resources.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-resources.sh @@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 2) TARGET_DEVICE_ARGS="--target-device ipad" ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-umbrella.h b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-umbrella.h index 554bd7cc..116da442 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-umbrella.h +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-frameworks.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-frameworks.sh index 893c16a6..0f29f13c 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-frameworks.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-frameworks.sh @@ -59,8 +59,13 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } @@ -82,3 +87,6 @@ strip_invalid_archs() { fi } +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-resources.sh b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-resources.sh index 25e9d377..4602c68a 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-resources.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-resources.sh @@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 2) TARGET_DEVICE_ARGS="--target-device ipad" ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-umbrella.h b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-umbrella.h index 4101e33d..9ced5302 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-umbrella.h +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.debug.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.debug.xcconfig index 52520ee3..364177a7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.debug.xcconfig @@ -1,4 +1,3 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.release.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.release.xcconfig index 52520ee3..364177a7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.release.xcconfig @@ -1,4 +1,3 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-resources.sh b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-resources.sh index 25e9d377..4602c68a 100755 --- a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-resources.sh +++ b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-resources.sh @@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 2) TARGET_DEVICE_ARGS="--target-device ipad" ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; diff --git a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-umbrella.h b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-umbrella.h index fe06cb50..a8d749c7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-umbrella.h +++ b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.debug.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.debug.xcconfig index b8f23954..467f54d7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.debug.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.debug.xcconfig @@ -1,7 +1,6 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' '@executable_path/../../Frameworks' OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking/AFNetworking.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking/VimeoNetworking.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "AFNetworking" -framework "VimeoNetworking" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" diff --git a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.release.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.release.xcconfig index b8f23954..467f54d7 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.release.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.release.xcconfig @@ -1,7 +1,6 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' '@executable_path/../../Frameworks' OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking/AFNetworking.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking/VimeoNetworking.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "AFNetworking" -framework "VimeoNetworking" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" diff --git a/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-prefix.pch b/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-prefix.pch index aa992a4a..beb2a244 100644 --- a/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-prefix.pch +++ b/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-prefix.pch @@ -1,4 +1,12 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-umbrella.h b/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-umbrella.h index 8bbc1e61..e091d155 100644 --- a/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-umbrella.h +++ b/Pods/Target Support Files/VimeoNetworking/VimeoNetworking-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif #import "VIMAccount.h" diff --git a/Pods/Target Support Files/VimeoNetworking/VimeoNetworking.xcconfig b/Pods/Target Support Files/VimeoNetworking/VimeoNetworking.xcconfig index 0e36ceca..4d397969 100644 --- a/Pods/Target Support Files/VimeoNetworking/VimeoNetworking.xcconfig +++ b/Pods/Target Support Files/VimeoNetworking/VimeoNetworking.xcconfig @@ -6,5 +6,6 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} +PODS_TARGET_SRCROOT = ${PODS_ROOT}/VimeoNetworking PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES diff --git a/VimeoUpload.podspec b/VimeoUpload.podspec index d96b0cd1..7af332d2 100644 --- a/VimeoUpload.podspec +++ b/VimeoUpload.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "VimeoUpload" - s.version = "1.0.1" + s.version = "1.0.2" s.summary = "The Vimeo iOS/OSX Upload SDK." s.description = <<-DESC An iOS/OSX library for uploading videos to Vimeo. The library supports the existing server-side upload flow. It also supports a new private server-side upload flow that will soon be made public. VimeoUpload's core can be extended to support any NSURLSession(background)Task workflow.' diff --git a/VimeoUpload/Upload/Model/VideoSettings.swift b/VimeoUpload/Upload/Model/VideoSettings.swift index 2b4dad12..2049833b 100644 --- a/VimeoUpload/Upload/Model/VideoSettings.swift +++ b/VimeoUpload/Upload/Model/VideoSettings.swift @@ -26,7 +26,7 @@ import Foundation -public class VideoSettings: NSObject +public class VideoSettings: NSObject, NSCoding { public var title: String? { @@ -104,7 +104,7 @@ public class VideoSettings: NSObject self.password = aDecoder.decodeObject(forKey: "password") as? String } - func encode(with aCoder: NSCoder) + public func encode(with aCoder: NSCoder) { aCoder.encode(self.title, forKey: "title") aCoder.encode(self.desc, forKey: "desc")