diff --git a/VimeoUpload+Demos/Cells/DemoCameraRollCell.swift b/Examples/VimeoUpload+Demos/Cells/DemoCameraRollCell.swift similarity index 100% rename from VimeoUpload+Demos/Cells/DemoCameraRollCell.swift rename to Examples/VimeoUpload+Demos/Cells/DemoCameraRollCell.swift diff --git a/VimeoUpload+Demos/Cells/DemoCameraRollCell.xib b/Examples/VimeoUpload+Demos/Cells/DemoCameraRollCell.xib similarity index 100% rename from VimeoUpload+Demos/Cells/DemoCameraRollCell.xib rename to Examples/VimeoUpload+Demos/Cells/DemoCameraRollCell.xib diff --git a/VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.swift b/Examples/VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.swift similarity index 100% rename from VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.swift rename to Examples/VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.swift diff --git a/VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.xib b/Examples/VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.xib similarity index 100% rename from VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.xib rename to Examples/VimeoUpload+Demos/ViewControllers/BaseCameraRollViewController.xib diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj/project.pbxproj b/Examples/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj/project.pbxproj similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj/project.pbxproj rename to Examples/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj/project.pbxproj diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSX/AppDelegate.swift b/Examples/VimeoUpload-OSX/VimeoUpload-OSX/AppDelegate.swift similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSX/AppDelegate.swift rename to Examples/VimeoUpload-OSX/VimeoUpload-OSX/AppDelegate.swift diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json b/Examples/VimeoUpload-OSX/VimeoUpload-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Examples/VimeoUpload-OSX/VimeoUpload-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSX/Base.lproj/Main.storyboard b/Examples/VimeoUpload-OSX/VimeoUpload-OSX/Base.lproj/Main.storyboard similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSX/Base.lproj/Main.storyboard rename to Examples/VimeoUpload-OSX/VimeoUpload-OSX/Base.lproj/Main.storyboard diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSX/Info.plist b/Examples/VimeoUpload-OSX/VimeoUpload-OSX/Info.plist similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSX/Info.plist rename to Examples/VimeoUpload-OSX/VimeoUpload-OSX/Info.plist diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSX/ViewController.swift b/Examples/VimeoUpload-OSX/VimeoUpload-OSX/ViewController.swift similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSX/ViewController.swift rename to Examples/VimeoUpload-OSX/VimeoUpload-OSX/ViewController.swift diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSXTests/Info.plist b/Examples/VimeoUpload-OSX/VimeoUpload-OSXTests/Info.plist similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSXTests/Info.plist rename to Examples/VimeoUpload-OSX/VimeoUpload-OSXTests/Info.plist diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSXTests/VimeoUpload_OSXTests.swift b/Examples/VimeoUpload-OSX/VimeoUpload-OSXTests/VimeoUpload_OSXTests.swift similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSXTests/VimeoUpload_OSXTests.swift rename to Examples/VimeoUpload-OSX/VimeoUpload-OSXTests/VimeoUpload_OSXTests.swift diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSXUITests/Info.plist b/Examples/VimeoUpload-OSX/VimeoUpload-OSXUITests/Info.plist similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSXUITests/Info.plist rename to Examples/VimeoUpload-OSX/VimeoUpload-OSXUITests/Info.plist diff --git a/Example/VimeoUpload-OSX/VimeoUpload-OSXUITests/VimeoUpload_OSXUITests.swift b/Examples/VimeoUpload-OSX/VimeoUpload-OSXUITests/VimeoUpload_OSXUITests.swift similarity index 100% rename from Example/VimeoUpload-OSX/VimeoUpload-OSXUITests/VimeoUpload_OSXUITests.swift rename to Examples/VimeoUpload-OSX/VimeoUpload-OSXUITests/VimeoUpload_OSXUITests.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj/project.pbxproj b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj/project.pbxproj similarity index 97% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj/project.pbxproj rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj/project.pbxproj index 579551da..35424ce7 100644 --- a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj/project.pbxproj +++ b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 5073D6E01CAD66A600D08C5F /* DemoCameraRollCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5073D6DB1CAD66A600D08C5F /* DemoCameraRollCell.swift */; }; + 5073D6E11CAD66A600D08C5F /* DemoCameraRollCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5073D6DC1CAD66A600D08C5F /* DemoCameraRollCell.xib */; }; + 5073D6E21CAD66A600D08C5F /* BaseCameraRollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5073D6DE1CAD66A600D08C5F /* BaseCameraRollViewController.swift */; }; + 5073D6E31CAD66A600D08C5F /* BaseCameraRollViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5073D6DF1CAD66A600D08C5F /* BaseCameraRollViewController.xib */; }; AFFA400F1C9CE8E000C7B6F3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA400E1C9CE8E000C7B6F3 /* AppDelegate.swift */; }; AFFA40161C9CE8E000C7B6F3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFFA40151C9CE8E000C7B6F3 /* Assets.xcassets */; }; AFFA40191C9CE8E000C7B6F3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AFFA40171C9CE8E000C7B6F3 /* LaunchScreen.storyboard */; }; @@ -78,10 +82,6 @@ AFFA40E91C9CE9EB00C7B6F3 /* DiskSpaceOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA409C1C9CE9EB00C7B6F3 /* DiskSpaceOperation.swift */; }; AFFA40EA1C9CE9EC00C7B6F3 /* WeeklyQuotaOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA409D1C9CE9EB00C7B6F3 /* WeeklyQuotaOperation.swift */; }; AFFA40EC1C9CE9EC00C7B6F3 /* VimeoUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA409F1C9CE9EB00C7B6F3 /* VimeoUpload.swift */; }; - AFFA40ED1C9CE9EC00C7B6F3 /* DemoCameraRollCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA40A21C9CE9EB00C7B6F3 /* DemoCameraRollCell.swift */; }; - AFFA40EE1C9CE9EC00C7B6F3 /* DemoCameraRollCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AFFA40A31C9CE9EB00C7B6F3 /* DemoCameraRollCell.xib */; }; - AFFA40EF1C9CE9EC00C7B6F3 /* BaseCameraRollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA40A51C9CE9EB00C7B6F3 /* BaseCameraRollViewController.swift */; }; - AFFA40F01C9CE9EC00C7B6F3 /* BaseCameraRollViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AFFA40A61C9CE9EB00C7B6F3 /* BaseCameraRollViewController.xib */; }; AFFA40F11C9CE9EC00C7B6F3 /* ALAssetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA40A81C9CE9EB00C7B6F3 /* ALAssetHelper.swift */; }; AFFA40F21C9CE9EC00C7B6F3 /* CameraRollAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA40A91C9CE9EB00C7B6F3 /* CameraRollAssetCell.swift */; }; AFFA40F31C9CE9EC00C7B6F3 /* CameraRollAssetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA40AA1C9CE9EB00C7B6F3 /* CameraRollAssetHelper.swift */; }; @@ -111,6 +111,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 5073D6DB1CAD66A600D08C5F /* DemoCameraRollCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoCameraRollCell.swift; sourceTree = ""; }; + 5073D6DC1CAD66A600D08C5F /* DemoCameraRollCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoCameraRollCell.xib; sourceTree = ""; }; + 5073D6DE1CAD66A600D08C5F /* BaseCameraRollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseCameraRollViewController.swift; sourceTree = ""; }; + 5073D6DF1CAD66A600D08C5F /* BaseCameraRollViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BaseCameraRollViewController.xib; sourceTree = ""; }; 9B8EBF50CBA80C187F8444F1 /* Pods-VimeoUpload-iOS-OldUpload.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VimeoUpload-iOS-OldUpload.release.xcconfig"; path = "../../Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.release.xcconfig"; sourceTree = ""; }; AFFA400B1C9CE8E000C7B6F3 /* VimeoUpload-iOS-OldUpload.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VimeoUpload-iOS-OldUpload.app"; sourceTree = BUILT_PRODUCTS_DIR; }; AFFA400E1C9CE8E000C7B6F3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -190,10 +194,6 @@ AFFA409C1C9CE9EB00C7B6F3 /* DiskSpaceOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiskSpaceOperation.swift; sourceTree = ""; }; AFFA409D1C9CE9EB00C7B6F3 /* WeeklyQuotaOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeeklyQuotaOperation.swift; sourceTree = ""; }; AFFA409F1C9CE9EB00C7B6F3 /* VimeoUpload.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VimeoUpload.swift; sourceTree = ""; }; - AFFA40A21C9CE9EB00C7B6F3 /* DemoCameraRollCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoCameraRollCell.swift; sourceTree = ""; }; - AFFA40A31C9CE9EB00C7B6F3 /* DemoCameraRollCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoCameraRollCell.xib; sourceTree = ""; }; - AFFA40A51C9CE9EB00C7B6F3 /* BaseCameraRollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseCameraRollViewController.swift; sourceTree = ""; }; - AFFA40A61C9CE9EB00C7B6F3 /* BaseCameraRollViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BaseCameraRollViewController.xib; sourceTree = ""; }; AFFA40A81C9CE9EB00C7B6F3 /* ALAssetHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ALAssetHelper.swift; sourceTree = ""; }; AFFA40A91C9CE9EB00C7B6F3 /* CameraRollAssetCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraRollAssetCell.swift; sourceTree = ""; }; AFFA40AA1C9CE9EB00C7B6F3 /* CameraRollAssetHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraRollAssetHelper.swift; sourceTree = ""; }; @@ -241,6 +241,34 @@ name = Pods; sourceTree = ""; }; + 5073D6D91CAD66A600D08C5F /* VimeoUpload+Demos */ = { + isa = PBXGroup; + children = ( + 5073D6DA1CAD66A600D08C5F /* Cells */, + 5073D6DD1CAD66A600D08C5F /* ViewControllers */, + ); + name = "VimeoUpload+Demos"; + path = "../../VimeoUpload+Demos"; + sourceTree = ""; + }; + 5073D6DA1CAD66A600D08C5F /* Cells */ = { + isa = PBXGroup; + children = ( + 5073D6DB1CAD66A600D08C5F /* DemoCameraRollCell.swift */, + 5073D6DC1CAD66A600D08C5F /* DemoCameraRollCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; + 5073D6DD1CAD66A600D08C5F /* ViewControllers */ = { + isa = PBXGroup; + children = ( + 5073D6DE1CAD66A600D08C5F /* BaseCameraRollViewController.swift */, + 5073D6DF1CAD66A600D08C5F /* BaseCameraRollViewController.xib */, + ); + path = ViewControllers; + sourceTree = ""; + }; AFFA40021C9CE8E000C7B6F3 = { isa = PBXGroup; children = ( @@ -271,8 +299,8 @@ AFFA403D1C9CE9B600C7B6F3 /* Cells */, AFFA40411C9CE9B600C7B6F3 /* ViewControllers */, AFFA404F1C9CE9EB00C7B6F3 /* VimeoUpload */, - AFFA40A01C9CE9EB00C7B6F3 /* VimeoUpload+Demos */, AFFA40A71C9CE9EB00C7B6F3 /* VimeoUpload+UIKit */, + 5073D6D91CAD66A600D08C5F /* VimeoUpload+Demos */, AFFA40151C9CE8E000C7B6F3 /* Assets.xcassets */, AFFA40171C9CE8E000C7B6F3 /* LaunchScreen.storyboard */, AFFA401A1C9CE8E000C7B6F3 /* Info.plist */, @@ -554,34 +582,6 @@ path = Sync; sourceTree = ""; }; - AFFA40A01C9CE9EB00C7B6F3 /* VimeoUpload+Demos */ = { - isa = PBXGroup; - children = ( - AFFA40A11C9CE9EB00C7B6F3 /* Cells */, - AFFA40A41C9CE9EB00C7B6F3 /* ViewControllers */, - ); - name = "VimeoUpload+Demos"; - path = "../../../VimeoUpload+Demos"; - sourceTree = ""; - }; - AFFA40A11C9CE9EB00C7B6F3 /* Cells */ = { - isa = PBXGroup; - children = ( - AFFA40A21C9CE9EB00C7B6F3 /* DemoCameraRollCell.swift */, - AFFA40A31C9CE9EB00C7B6F3 /* DemoCameraRollCell.xib */, - ); - path = Cells; - sourceTree = ""; - }; - AFFA40A41C9CE9EB00C7B6F3 /* ViewControllers */ = { - isa = PBXGroup; - children = ( - AFFA40A51C9CE9EB00C7B6F3 /* BaseCameraRollViewController.swift */, - AFFA40A61C9CE9EB00C7B6F3 /* BaseCameraRollViewController.xib */, - ); - path = ViewControllers; - sourceTree = ""; - }; AFFA40A71C9CE9EB00C7B6F3 /* VimeoUpload+UIKit */ = { isa = PBXGroup; children = ( @@ -733,9 +733,9 @@ AFFA404C1C9CE9B600C7B6F3 /* UploadsViewController.xib in Resources */, AFFA40481C9CE9B600C7B6F3 /* UploadCell.xib in Resources */, AFFA404E1C9CE9B600C7B6F3 /* VideoSettingsViewController.xib in Resources */, - AFFA40EE1C9CE9EC00C7B6F3 /* DemoCameraRollCell.xib in Resources */, + 5073D6E11CAD66A600D08C5F /* DemoCameraRollCell.xib in Resources */, AFFA40161C9CE8E000C7B6F3 /* Assets.xcassets in Resources */, - AFFA40F01C9CE9EC00C7B6F3 /* BaseCameraRollViewController.xib in Resources */, + 5073D6E31CAD66A600D08C5F /* BaseCameraRollViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -827,14 +827,13 @@ AFFA40D41C9CE9EB00C7B6F3 /* VimeoResponseSerializer+OldUpload.swift in Sources */, AFFA40DE1C9CE9EB00C7B6F3 /* MeOperation.swift in Sources */, AFFA40D71C9CE9EB00C7B6F3 /* DeleteVideoOperation.swift in Sources */, - AFFA40EF1C9CE9EC00C7B6F3 /* BaseCameraRollViewController.swift in Sources */, AFFA40F31C9CE9EC00C7B6F3 /* CameraRollAssetHelper.swift in Sources */, AFFA40CD1C9CE9EB00C7B6F3 /* NSError+Upload.swift in Sources */, AFFA40BB1C9CE9EB00C7B6F3 /* AFURLSessionManager+Extensions.swift in Sources */, AFFA40F41C9CE9EC00C7B6F3 /* NSString+Conversions.swift in Sources */, - AFFA40ED1C9CE9EC00C7B6F3 /* DemoCameraRollCell.swift in Sources */, AFFA40BA1C9CE9EB00C7B6F3 /* ReachableDescriptorManager.swift in Sources */, AFFA40C81C9CE9EB00C7B6F3 /* VideoDescriptor.swift in Sources */, + 5073D6E21CAD66A600D08C5F /* BaseCameraRollViewController.swift in Sources */, AFFA40E41C9CE9EB00C7B6F3 /* ALAssetRetryUploadOperation.swift in Sources */, AFFA40B71C9CE9EB00C7B6F3 /* DescriptorManagerDelegate.swift in Sources */, AFFA40471C9CE9B600C7B6F3 /* UploadCell.swift in Sources */, @@ -847,6 +846,7 @@ AFFA40B51C9CE9EB00C7B6F3 /* DescriptorManager.swift in Sources */, AFFA40E81C9CE9EB00C7B6F3 /* DailyQuotaOperation.swift in Sources */, AFFA40C31C9CE9EB00C7B6F3 /* VideoRefreshManager.swift in Sources */, + 5073D6E01CAD66A600D08C5F /* DemoCameraRollCell.swift in Sources */, AFFA40EA1C9CE9EC00C7B6F3 /* WeeklyQuotaOperation.swift in Sources */, AFFA40E71C9CE9EB00C7B6F3 /* RetryUploadOperation.swift in Sources */, AFFA40D81C9CE9EB00C7B6F3 /* ExportOperation.swift in Sources */, diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/AppDelegate.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/AppDelegate.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/AppDelegate.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/AppDelegate.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Assets.xcassets/AppIcon.appiconset/Contents.json b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Base.lproj/LaunchScreen.storyboard b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Base.lproj/LaunchScreen.storyboard rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Base.lproj/LaunchScreen.storyboard diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Bridge.h b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Bridge.h similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Bridge.h rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Bridge.h diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.xib b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.xib similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.xib rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Cells/UploadCell.xib diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Info.plist b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Info.plist similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Info.plist rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/Info.plist diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/OldVimeoUpload.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/OldVimeoUpload.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/OldVimeoUpload.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/OldVimeoUpload.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/CameraRollViewController.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/CameraRollViewController.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/CameraRollViewController.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/CameraRollViewController.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.xib b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.xib similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.xib rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/UploadsViewController.xib diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.xib b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.xib similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.xib rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload/ViewControllers/VideoSettingsViewController.xib diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/Info.plist b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/Info.plist similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/Info.plist rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/Info.plist diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/VimeoUpload_iOS_OldUploadTests.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/VimeoUpload_iOS_OldUploadTests.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/VimeoUpload_iOS_OldUploadTests.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadTests/VimeoUpload_iOS_OldUploadTests.swift diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/Info.plist b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/Info.plist similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/Info.plist rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/Info.plist diff --git a/Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/VimeoUpload_iOS_OldUploadUITests.swift b/Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/VimeoUpload_iOS_OldUploadUITests.swift similarity index 100% rename from Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/VimeoUpload_iOS_OldUploadUITests.swift rename to Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUploadUITests/VimeoUpload_iOS_OldUploadUITests.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj/project.pbxproj b/Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj/project.pbxproj similarity index 97% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj/project.pbxproj rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj/project.pbxproj index 7734a5f5..fd6c1d9b 100644 --- a/Example/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj/project.pbxproj +++ b/Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 5073D6EB1CAD66C600D08C5F /* DemoCameraRollCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5073D6E61CAD66C600D08C5F /* DemoCameraRollCell.swift */; }; + 5073D6EC1CAD66C600D08C5F /* DemoCameraRollCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5073D6E71CAD66C600D08C5F /* DemoCameraRollCell.xib */; }; + 5073D6ED1CAD66C600D08C5F /* BaseCameraRollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5073D6E91CAD66C600D08C5F /* BaseCameraRollViewController.swift */; }; + 5073D6EE1CAD66C600D08C5F /* BaseCameraRollViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5073D6EA1CAD66C600D08C5F /* BaseCameraRollViewController.xib */; }; AFFA3F181C9CE22500C7B6F3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3F171C9CE22500C7B6F3 /* AppDelegate.swift */; }; AFFA3F1F1C9CE22500C7B6F3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFFA3F1E1C9CE22500C7B6F3 /* Assets.xcassets */; }; AFFA3F221C9CE22500C7B6F3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AFFA3F201C9CE22500C7B6F3 /* LaunchScreen.storyboard */; }; @@ -78,10 +82,6 @@ AFFA3FF21C9CE42000C7B6F3 /* DiskSpaceOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FA51C9CE41F00C7B6F3 /* DiskSpaceOperation.swift */; }; AFFA3FF31C9CE42000C7B6F3 /* WeeklyQuotaOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FA61C9CE41F00C7B6F3 /* WeeklyQuotaOperation.swift */; }; AFFA3FF51C9CE42000C7B6F3 /* VimeoUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FA81C9CE41F00C7B6F3 /* VimeoUpload.swift */; }; - AFFA3FF61C9CE42000C7B6F3 /* DemoCameraRollCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FAB1C9CE41F00C7B6F3 /* DemoCameraRollCell.swift */; }; - AFFA3FF71C9CE42000C7B6F3 /* DemoCameraRollCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AFFA3FAC1C9CE41F00C7B6F3 /* DemoCameraRollCell.xib */; }; - AFFA3FF81C9CE42000C7B6F3 /* BaseCameraRollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FAE1C9CE41F00C7B6F3 /* BaseCameraRollViewController.swift */; }; - AFFA3FF91C9CE42000C7B6F3 /* BaseCameraRollViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AFFA3FAF1C9CE41F00C7B6F3 /* BaseCameraRollViewController.xib */; }; AFFA3FFA1C9CE42000C7B6F3 /* ALAssetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FB11C9CE41F00C7B6F3 /* ALAssetHelper.swift */; }; AFFA3FFB1C9CE42000C7B6F3 /* CameraRollAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FB21C9CE41F00C7B6F3 /* CameraRollAssetCell.swift */; }; AFFA3FFC1C9CE42000C7B6F3 /* CameraRollAssetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFA3FB31C9CE41F00C7B6F3 /* CameraRollAssetHelper.swift */; }; @@ -111,6 +111,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 5073D6E61CAD66C600D08C5F /* DemoCameraRollCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoCameraRollCell.swift; sourceTree = ""; }; + 5073D6E71CAD66C600D08C5F /* DemoCameraRollCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoCameraRollCell.xib; sourceTree = ""; }; + 5073D6E91CAD66C600D08C5F /* BaseCameraRollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseCameraRollViewController.swift; sourceTree = ""; }; + 5073D6EA1CAD66C600D08C5F /* BaseCameraRollViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BaseCameraRollViewController.xib; sourceTree = ""; }; 5286EE6686C20A6F5B5BFD2C /* Pods-VimeoUpload-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VimeoUpload-iOS.release.xcconfig"; path = "../../Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.release.xcconfig"; sourceTree = ""; }; 8D408A747D8113745C4A1D77 /* Pods-VimeoUpload-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VimeoUpload-iOS.debug.xcconfig"; path = "../../Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.debug.xcconfig"; sourceTree = ""; }; AFFA3F141C9CE22500C7B6F3 /* VimeoUpload-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VimeoUpload-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -191,10 +195,6 @@ AFFA3FA51C9CE41F00C7B6F3 /* DiskSpaceOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiskSpaceOperation.swift; sourceTree = ""; }; AFFA3FA61C9CE41F00C7B6F3 /* WeeklyQuotaOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeeklyQuotaOperation.swift; sourceTree = ""; }; AFFA3FA81C9CE41F00C7B6F3 /* VimeoUpload.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VimeoUpload.swift; sourceTree = ""; }; - AFFA3FAB1C9CE41F00C7B6F3 /* DemoCameraRollCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoCameraRollCell.swift; sourceTree = ""; }; - AFFA3FAC1C9CE41F00C7B6F3 /* DemoCameraRollCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoCameraRollCell.xib; sourceTree = ""; }; - AFFA3FAE1C9CE41F00C7B6F3 /* BaseCameraRollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseCameraRollViewController.swift; sourceTree = ""; }; - AFFA3FAF1C9CE41F00C7B6F3 /* BaseCameraRollViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BaseCameraRollViewController.xib; sourceTree = ""; }; AFFA3FB11C9CE41F00C7B6F3 /* ALAssetHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ALAssetHelper.swift; sourceTree = ""; }; AFFA3FB21C9CE41F00C7B6F3 /* CameraRollAssetCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraRollAssetCell.swift; sourceTree = ""; }; AFFA3FB31C9CE41F00C7B6F3 /* CameraRollAssetHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraRollAssetHelper.swift; sourceTree = ""; }; @@ -240,6 +240,34 @@ name = Frameworks; sourceTree = ""; }; + 5073D6E41CAD66C600D08C5F /* VimeoUpload+Demos */ = { + isa = PBXGroup; + children = ( + 5073D6E51CAD66C600D08C5F /* Cells */, + 5073D6E81CAD66C600D08C5F /* ViewControllers */, + ); + name = "VimeoUpload+Demos"; + path = "../../VimeoUpload+Demos"; + sourceTree = ""; + }; + 5073D6E51CAD66C600D08C5F /* Cells */ = { + isa = PBXGroup; + children = ( + 5073D6E61CAD66C600D08C5F /* DemoCameraRollCell.swift */, + 5073D6E71CAD66C600D08C5F /* DemoCameraRollCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; + 5073D6E81CAD66C600D08C5F /* ViewControllers */ = { + isa = PBXGroup; + children = ( + 5073D6E91CAD66C600D08C5F /* BaseCameraRollViewController.swift */, + 5073D6EA1CAD66C600D08C5F /* BaseCameraRollViewController.xib */, + ); + path = ViewControllers; + sourceTree = ""; + }; AFFA3F0B1C9CE22500C7B6F3 = { isa = PBXGroup; children = ( @@ -270,8 +298,8 @@ AFFA3F461C9CE34700C7B6F3 /* Cells */, AFFA3F4A1C9CE34700C7B6F3 /* ViewControllers */, AFFA3F581C9CE41F00C7B6F3 /* VimeoUpload */, - AFFA3FA91C9CE41F00C7B6F3 /* VimeoUpload+Demos */, AFFA3FB01C9CE41F00C7B6F3 /* VimeoUpload+UIKit */, + 5073D6E41CAD66C600D08C5F /* VimeoUpload+Demos */, AFFA3F1E1C9CE22500C7B6F3 /* Assets.xcassets */, AFFA3F201C9CE22500C7B6F3 /* LaunchScreen.storyboard */, AFFA3F231C9CE22500C7B6F3 /* Info.plist */, @@ -553,34 +581,6 @@ path = Sync; sourceTree = ""; }; - AFFA3FA91C9CE41F00C7B6F3 /* VimeoUpload+Demos */ = { - isa = PBXGroup; - children = ( - AFFA3FAA1C9CE41F00C7B6F3 /* Cells */, - AFFA3FAD1C9CE41F00C7B6F3 /* ViewControllers */, - ); - name = "VimeoUpload+Demos"; - path = "../../../VimeoUpload+Demos"; - sourceTree = ""; - }; - AFFA3FAA1C9CE41F00C7B6F3 /* Cells */ = { - isa = PBXGroup; - children = ( - AFFA3FAB1C9CE41F00C7B6F3 /* DemoCameraRollCell.swift */, - AFFA3FAC1C9CE41F00C7B6F3 /* DemoCameraRollCell.xib */, - ); - path = Cells; - sourceTree = ""; - }; - AFFA3FAD1C9CE41F00C7B6F3 /* ViewControllers */ = { - isa = PBXGroup; - children = ( - AFFA3FAE1C9CE41F00C7B6F3 /* BaseCameraRollViewController.swift */, - AFFA3FAF1C9CE41F00C7B6F3 /* BaseCameraRollViewController.xib */, - ); - path = ViewControllers; - sourceTree = ""; - }; AFFA3FB01C9CE41F00C7B6F3 /* VimeoUpload+UIKit */ = { isa = PBXGroup; children = ( @@ -733,9 +733,9 @@ AFFA3F571C9CE34700C7B6F3 /* VideoSettingsViewController.xib in Resources */, AFFA3F511C9CE34700C7B6F3 /* VideoCell.xib in Resources */, AFFA3F551C9CE34700C7B6F3 /* MyVideosViewController.xib in Resources */, - AFFA3FF71C9CE42000C7B6F3 /* DemoCameraRollCell.xib in Resources */, + 5073D6EC1CAD66C600D08C5F /* DemoCameraRollCell.xib in Resources */, AFFA3F1F1C9CE22500C7B6F3 /* Assets.xcassets in Resources */, - AFFA3FF91C9CE42000C7B6F3 /* BaseCameraRollViewController.xib in Resources */, + 5073D6EE1CAD66C600D08C5F /* BaseCameraRollViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -827,14 +827,13 @@ AFFA3FDD1C9CE42000C7B6F3 /* VimeoResponseSerializer+OldUpload.swift in Sources */, AFFA3FE71C9CE42000C7B6F3 /* MeOperation.swift in Sources */, AFFA3FE01C9CE42000C7B6F3 /* DeleteVideoOperation.swift in Sources */, - AFFA3FF81C9CE42000C7B6F3 /* BaseCameraRollViewController.swift in Sources */, AFFA3FFC1C9CE42000C7B6F3 /* CameraRollAssetHelper.swift in Sources */, AFFA3FD61C9CE42000C7B6F3 /* NSError+Upload.swift in Sources */, AFFA3FC41C9CE42000C7B6F3 /* AFURLSessionManager+Extensions.swift in Sources */, AFFA3FFD1C9CE42000C7B6F3 /* NSString+Conversions.swift in Sources */, - AFFA3FF61C9CE42000C7B6F3 /* DemoCameraRollCell.swift in Sources */, AFFA3FC31C9CE42000C7B6F3 /* ReachableDescriptorManager.swift in Sources */, AFFA3FD11C9CE42000C7B6F3 /* VideoDescriptor.swift in Sources */, + 5073D6ED1CAD66C600D08C5F /* BaseCameraRollViewController.swift in Sources */, AFFA3FED1C9CE42000C7B6F3 /* ALAssetRetryUploadOperation.swift in Sources */, AFFA3FC01C9CE42000C7B6F3 /* DescriptorManagerDelegate.swift in Sources */, AFFA3F181C9CE22500C7B6F3 /* AppDelegate.swift in Sources */, @@ -847,6 +846,7 @@ AFFA3FBE1C9CE42000C7B6F3 /* DescriptorManager.swift in Sources */, AFFA3FF11C9CE42000C7B6F3 /* DailyQuotaOperation.swift in Sources */, AFFA3FCC1C9CE42000C7B6F3 /* VideoRefreshManager.swift in Sources */, + 5073D6EB1CAD66C600D08C5F /* DemoCameraRollCell.swift in Sources */, AFFA3FF31C9CE42000C7B6F3 /* WeeklyQuotaOperation.swift in Sources */, AFFA3FF01C9CE42000C7B6F3 /* RetryUploadOperation.swift in Sources */, AFFA3FE11C9CE42000C7B6F3 /* ExportOperation.swift in Sources */, diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/AppDelegate.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/AppDelegate.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/AppDelegate.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/AppDelegate.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/Base.lproj/LaunchScreen.storyboard b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/Base.lproj/LaunchScreen.storyboard rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/Base.lproj/LaunchScreen.storyboard diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/Bridge.h b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Bridge.h similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/Bridge.h rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/Bridge.h diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.xib b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.xib similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.xib rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/Cells/VideoCell.xib diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/Info.plist b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/Info.plist similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/Info.plist rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/Info.plist diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/NewVimeoUpload.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/NewVimeoUpload.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/NewVimeoUpload.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/NewVimeoUpload.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/CameraRollViewController.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/CameraRollViewController.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/CameraRollViewController.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/CameraRollViewController.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.xib b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.xib similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.xib rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/MyVideosViewController.xib diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.xib b/Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.xib similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.xib rename to Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.xib diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOSTests/Info.plist b/Examples/VimeoUpload-iOS/VimeoUpload-iOSTests/Info.plist similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOSTests/Info.plist rename to Examples/VimeoUpload-iOS/VimeoUpload-iOSTests/Info.plist diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOSTests/VimeoUpload_iOSTests.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOSTests/VimeoUpload_iOSTests.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOSTests/VimeoUpload_iOSTests.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOSTests/VimeoUpload_iOSTests.swift diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOSUITests/Info.plist b/Examples/VimeoUpload-iOS/VimeoUpload-iOSUITests/Info.plist similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOSUITests/Info.plist rename to Examples/VimeoUpload-iOS/VimeoUpload-iOSUITests/Info.plist diff --git a/Example/VimeoUpload-iOS/VimeoUpload-iOSUITests/VimeoUpload_iOSUITests.swift b/Examples/VimeoUpload-iOS/VimeoUpload-iOSUITests/VimeoUpload_iOSUITests.swift similarity index 100% rename from Example/VimeoUpload-iOS/VimeoUpload-iOSUITests/VimeoUpload_iOSUITests.swift rename to Examples/VimeoUpload-iOS/VimeoUpload-iOSUITests/VimeoUpload_iOSUITests.swift diff --git a/Podfile b/Podfile index 339beb09..a0b5d813 100644 --- a/Podfile +++ b/Podfile @@ -1,7 +1,7 @@ workspace 'VimeoUpload' -xcodeproj 'Example/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj' -xcodeproj 'Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj' -xcodeproj 'Example/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj' +xcodeproj 'Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj' +xcodeproj 'Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj' +xcodeproj 'Examples/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj' def shared_pods pod 'AFNetworking', '2.6.3' @@ -12,7 +12,7 @@ target :'VimeoUpload-iOS' do #use_frameworks! shared_pods pod 'VIMNetworking/Model', '6.0.0' - xcodeproj 'Example/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj' + xcodeproj 'Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj' end target :'VimeoUpload-iOS-OldUpload' do @@ -20,11 +20,12 @@ target :'VimeoUpload-iOS-OldUpload' do #use_frameworks! shared_pods pod 'VIMNetworking/Model', '6.0.0' - xcodeproj 'Example/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj' + xcodeproj 'Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj' end target :'VimeoUpload-OSX' do platform :osx, '10.9' shared_pods - xcodeproj 'Example/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj' +# pod 'VIMNetworking/Model', '6.0.0' + xcodeproj 'Examples/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj' end \ No newline at end of file diff --git a/VimeoUpload+UIKit/Extensions/NSString+Conversions.swift b/VimeoUpload+UIKit/Extensions/NSString+Conversions.swift index 8540dfe4..8155626d 100644 --- a/VimeoUpload+UIKit/Extensions/NSString+Conversions.swift +++ b/VimeoUpload+UIKit/Extensions/NSString+Conversions.swift @@ -28,9 +28,9 @@ import Foundation extension NSString { - static func stringFromFileSize(var bytes bytes: Float64) -> NSString + static func stringFromFileSize(bytes bytes: Float64) -> NSString { - bytes = max(bytes, 0) + let bytes = max(bytes, 0) let kilobyte: Float64 = 1024 let megabyte = kilobyte * 1024 @@ -69,9 +69,9 @@ extension NSString return string } - static func stringFromDurationInSeconds(var duration: Float64) -> NSString + static func stringFromDurationInSeconds(duration: Float64) -> NSString { - duration = max(duration, 0) + let duration = max(duration, 0) let hours = Int(floor(duration / (60 * 60))) let minutes = hours > 0 ? Int(floor((duration % (60 * 60)) / 60)) : Int(floor(duration / 60)) diff --git a/VimeoUpload.podspec b/VimeoUpload.podspec index 59a4b2e2..a4ff72aa 100644 --- a/VimeoUpload.podspec +++ b/VimeoUpload.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = "VimeoUpload" - s.version = "0.0.1" + s.version = "0.9.0" s.summary = "The Vimeo iOS/OSX Upload SDK." s.description = <<-DESC - An iOS/OSX library for uploading videos to Vimeo + 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.' DESC s.homepage = "https://github.com/vimeo/VimeoUpload" @@ -13,7 +13,9 @@ Pod::Spec.new do |s| s.authors = { "Alfie Hanssen" => "alfiehanssen@gmail.com", "Rob Huebner" => "robh@vimeo.com", - "Gavin King" => "gavin@vimeo.com"} + "Gavin King" => "gavin@vimeo.com", + "Nicole Lehrer" => "nicole@vimeo.com", + "Chris Larsen" => "chrisl@vimeo.com"} s.social_media_url = "http://twitter.com/vimeo" @@ -21,13 +23,13 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.9' s.source = { :git => "https://github.com/vimeo/VimeoUpload.git", :tag => s.version.to_s } - s.source_files = "VimeoUpload", "VimeoUpload/**/*.{swift}" + s.source_files = "VimeoUpload/**/*.{swift}", "VimeoUpload+UIKit/**/*.{swift}" s.requires_arc = true - s.ios.frameworks = "Foundation", "AVFoundation", "AssetsLibrary", "Photos", "MobileCoreServices", "UIKit" + s.ios.frameworks = "Foundation", "AVFoundation", "AssetsLibrary", "Photos", "MobileCoreServices", "UIKit", "CoreGraphics" s.osx.frameworks = "Foundation", "AVFoundation", "CoreServices", "Cocoa" - s.osx.exclude_files = "VimeoUpload/Operations/PHAssetOperation.swift" +# s.osx.exclude_files = "VimeoUpload/Operations/PHAssetOperation.swift" s.subspec 'AFNetworking' do |ss| ss.dependency 'AFNetworking', '2.6.3' diff --git a/VimeoUpload.xcworkspace/contents.xcworkspacedata b/VimeoUpload.xcworkspace/contents.xcworkspacedata index bde504b9..55d4472c 100644 --- a/VimeoUpload.xcworkspace/contents.xcworkspacedata +++ b/VimeoUpload.xcworkspace/contents.xcworkspacedata @@ -2,13 +2,13 @@ + location = "group:Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj"> + location = "group:Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj"> + location = "group:Examples/VimeoUpload-OSX/VimeoUpload-OSX.xcodeproj"> diff --git a/VimeoUpload/Descriptor System/ProgressDescriptor.swift b/VimeoUpload/Descriptor System/ProgressDescriptor.swift index e8fb5a2f..8e8aa8e8 100644 --- a/VimeoUpload/Descriptor System/ProgressDescriptor.swift +++ b/VimeoUpload/Descriptor System/ProgressDescriptor.swift @@ -24,7 +24,7 @@ // THE SOFTWARE. // -import UIKit +import Foundation class ProgressDescriptor: Descriptor { diff --git a/VimeoUpload/Extensions/AFURLSessionManager+Extensions.swift b/VimeoUpload/Extensions/AFURLSessionManager+Extensions.swift index 11e3404d..f3e9435e 100644 --- a/VimeoUpload/Extensions/AFURLSessionManager+Extensions.swift +++ b/VimeoUpload/Extensions/AFURLSessionManager+Extensions.swift @@ -24,7 +24,7 @@ // THE SOFTWARE. // -import UIKit +import Foundation extension AFURLSessionManager { diff --git a/VimeoUpload/Networking/VimeoSessionManager.swift b/VimeoUpload/Networking/VimeoSessionManager.swift index 18c13381..bbbba947 100644 --- a/VimeoUpload/Networking/VimeoSessionManager.swift +++ b/VimeoUpload/Networking/VimeoSessionManager.swift @@ -92,6 +92,8 @@ class VimeoSessionManager: AFHTTPSessionManager { let sessionConfiguration: NSURLSessionConfiguration + // We need this check for projects that include the library and support iOS7 + if #available(iOS 8.0, OSX 10.10, *) { sessionConfiguration = NSURLSessionConfiguration.backgroundSessionConfigurationWithIdentifier(identifier) diff --git a/VimeoUpload/Upload/Descriptor System/DescriptorManagerTracker.swift b/VimeoUpload/Upload/Descriptor System/DescriptorManagerTracker.swift index 2d61ceff..a43b318b 100644 --- a/VimeoUpload/Upload/Descriptor System/DescriptorManagerTracker.swift +++ b/VimeoUpload/Upload/Descriptor System/DescriptorManagerTracker.swift @@ -25,7 +25,12 @@ // import Foundation -import UIKit + +#if os(iOS) + import UIKit +#elseif os(OSX) + +#endif // We use this class purely to report lifecycle events via print statements and local notifications [AH] 10/28/2015 diff --git a/VimeoUpload/Upload/Operations/Async/ExportOperation.swift b/VimeoUpload/Upload/Operations/Async/ExportOperation.swift index 269c998a..12bde5a1 100644 --- a/VimeoUpload/Upload/Operations/Async/ExportOperation.swift +++ b/VimeoUpload/Upload/Operations/Async/ExportOperation.swift @@ -52,7 +52,7 @@ class ExportOperation: ConcurrentOperation convenience init(asset: AVAsset) { - let exportSession = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetHighestQuality)! + let exportSession = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetPassthrough)! self.init(exportSession: exportSession) } @@ -115,7 +115,8 @@ class ExportOperation: ConcurrentOperation } // AVAssetExportSession does not do an internal check to see if there's ample disk space available to perform the export [AH] 12/06/2015 - + // However this check will not work with presetName "passthrough" since that preset reports estimatedOutputFileLength of zero always. + let availableDiskSpace = try? NSFileManager.defaultManager().availableDiskSpace() // Double optional if let diskSpace = availableDiskSpace, let space = diskSpace where space.longLongValue < self.exportSession.estimatedOutputFileLength { diff --git a/VimeoUpload/Upload/Operations/Async/iOS7/ALAssetExportQuotaOperation.swift b/VimeoUpload/Upload/Operations/Async/iOS7/ALAssetExportQuotaOperation.swift index f84f3c73..fedb0754 100644 --- a/VimeoUpload/Upload/Operations/Async/iOS7/ALAssetExportQuotaOperation.swift +++ b/VimeoUpload/Upload/Operations/Async/iOS7/ALAssetExportQuotaOperation.swift @@ -24,9 +24,12 @@ // THE SOFTWARE. // -import AssetsLibrary import AVFoundation +#if os(iOS) + import AssetsLibrary +#endif + // This flow encapsulates the following steps: // 1. Export (check disk space within this step) // 2. Check weekly quota diff --git a/VimeoUpload/Upload/Operations/Async/iOS8/PHAssetExportSessionOperation.swift b/VimeoUpload/Upload/Operations/Async/iOS8/PHAssetExportSessionOperation.swift index 0d2c881b..ff354052 100644 --- a/VimeoUpload/Upload/Operations/Async/iOS8/PHAssetExportSessionOperation.swift +++ b/VimeoUpload/Upload/Operations/Async/iOS8/PHAssetExportSessionOperation.swift @@ -46,7 +46,7 @@ class PHAssetExportSessionOperation: ConcurrentOperation self.cleanup() } - init(phAsset: PHAsset, exportPreset: String = AVAssetExportPresetHighestQuality) + init(phAsset: PHAsset, exportPreset: String = AVAssetExportPresetPassthrough) { self.phAsset = phAsset self.exportPreset = exportPreset