7 Commits

Author SHA1 Message Date
Alfie Hanssen 58ff13c70b updated pod version number 2015-09-17 22:08:50 -04:00
Alfie Hanssen d6c5ab0629 resolved xcode warning 2015-09-17 22:05:36 -04:00
Alfie Hanssen ea5b11e13c updated pod version number 2015-09-17 22:03:15 -04:00
Alfie Hanssen 6ac137f9ff Merge pull request #18 from vimeo/tests
Unit Test Setup
2015-09-14 16:31:38 -04:00
Alfie Hanssen 5e197fd1c5 Update README.md 2015-09-14 11:56:50 -04:00
Alfie Hanssen 0d91f5a054 added untracked files 2015-09-10 14:52:11 -04:00
Alfie Hanssen 09f58850e8 added test target, set it up to run tests on build 2015-09-10 14:42:34 -04:00
8 changed files with 263 additions and 119 deletions
+30 -12
View File
@@ -1,4 +1,27 @@
.DS_Store
## Build generated
build/
DerivedData
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap
*.ipa
*.xcuserstate
@@ -11,20 +34,15 @@ xcuserdata/
.DS_Store
*.DS_Store
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
*.LSOverride
# Cocoapods
Pods
+1 -1
View File
@@ -85,7 +85,7 @@ Optionally implement the `VIMVideoPlayerViewDelegate` protocol methods:
See `VIMVideoPlayer.h` for additional configuration options and functionality.
See `VIMVideoPlayerViewController` for an example of how to encapsulate a `VIMVideoPlayerView` instance with playback controls (play/pause/seek/airplay etc).
See the [Pegasus](https://github.com/vimeo/Pegasus) project for an example of how to encapsulate a `VIMVideoPlayerView` instance with playback controls (play/pause/seek/airplay etc).
## License
+1 -1
View File
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = "VIMVideoPlayer"
s.version = "5.5.5"
s.version = "5.6.0"
s.summary = "A simple wrapper around the AVPlayer and AVPlayerLayer classes."
s.description = <<-DESC
VIMVideoPlayer is a simple wrapper around the AVPlayer and AVPlayerLayer classes. Check out the README for details. And the Pegasus project for a demo.
+90 -103
View File
@@ -7,13 +7,14 @@
objects = {
/* Begin PBXBuildFile section */
50E5070C1B1E23A600DF1F7A /* libVIMVideoPlayer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E507001B1E23A600DF1F7A /* libVIMVideoPlayer.a */; };
501A3B931BA205A20059040B /* VIMVideoPlayerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 501A3B921BA205A20059040B /* VIMVideoPlayerTests.m */; };
501A3B951BA205A20059040B /* libVIMVideoPlayer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E507001B1E23A600DF1F7A /* libVIMVideoPlayer.a */; settings = {ASSET_TAGS = (); }; };
50E5071E1B1E23E100DF1F7A /* VIMVideoPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E5071B1B1E23E100DF1F7A /* VIMVideoPlayer.m */; };
50E5071F1B1E23E100DF1F7A /* VIMVideoPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E5071D1B1E23E100DF1F7A /* VIMVideoPlayerView.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
50E5070D1B1E23A600DF1F7A /* PBXContainerItemProxy */ = {
501A3B961BA205A20059040B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50E506F81B1E23A600DF1F7A /* Project object */;
proxyType = 1;
@@ -35,9 +36,10 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
501A3B901BA205A20059040B /* VIMVideoPlayerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VIMVideoPlayerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
501A3B921BA205A20059040B /* VIMVideoPlayerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VIMVideoPlayerTests.m; sourceTree = "<group>"; };
501A3B941BA205A20059040B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50E507001B1E23A600DF1F7A /* libVIMVideoPlayer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libVIMVideoPlayer.a; sourceTree = BUILT_PRODUCTS_DIR; };
50E5070B1B1E23A600DF1F7A /* VIMVideoPlayerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VIMVideoPlayerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
50E507111B1E23A600DF1F7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50E5071A1B1E23E100DF1F7A /* VIMVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VIMVideoPlayer.h; sourceTree = "<group>"; };
50E5071B1B1E23E100DF1F7A /* VIMVideoPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VIMVideoPlayer.m; sourceTree = "<group>"; };
50E5071C1B1E23E100DF1F7A /* VIMVideoPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VIMVideoPlayerView.h; sourceTree = "<group>"; };
@@ -45,6 +47,14 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
501A3B8D1BA205A20059040B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
501A3B951BA205A20059040B /* libVIMVideoPlayer.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
50E506FD1B1E23A600DF1F7A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -52,22 +62,23 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
50E507081B1E23A600DF1F7A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
50E5070C1B1E23A600DF1F7A /* libVIMVideoPlayer.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
501A3B911BA205A20059040B /* VIMVideoPlayerTests */ = {
isa = PBXGroup;
children = (
501A3B921BA205A20059040B /* VIMVideoPlayerTests.m */,
501A3B941BA205A20059040B /* Info.plist */,
);
path = VIMVideoPlayerTests;
sourceTree = "<group>";
};
50E506F71B1E23A600DF1F7A = {
isa = PBXGroup;
children = (
50E507021B1E23A600DF1F7A /* VIMVideoPlayer */,
50E5070F1B1E23A600DF1F7A /* VIMVideoPlayerTests */,
501A3B911BA205A20059040B /* VIMVideoPlayerTests */,
50E507011B1E23A600DF1F7A /* Products */,
);
sourceTree = "<group>";
@@ -76,7 +87,7 @@
isa = PBXGroup;
children = (
50E507001B1E23A600DF1F7A /* libVIMVideoPlayer.a */,
50E5070B1B1E23A600DF1F7A /* VIMVideoPlayerTests.xctest */,
501A3B901BA205A20059040B /* VIMVideoPlayerTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -92,25 +103,27 @@
path = VIMVideoPlayer;
sourceTree = "<group>";
};
50E5070F1B1E23A600DF1F7A /* VIMVideoPlayerTests */ = {
isa = PBXGroup;
children = (
50E507101B1E23A600DF1F7A /* Supporting Files */,
);
path = VIMVideoPlayerTests;
sourceTree = "<group>";
};
50E507101B1E23A600DF1F7A /* Supporting Files */ = {
isa = PBXGroup;
children = (
50E507111B1E23A600DF1F7A /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
501A3B8F1BA205A20059040B /* VIMVideoPlayerTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 501A3B981BA205A20059040B /* Build configuration list for PBXNativeTarget "VIMVideoPlayerTests" */;
buildPhases = (
501A3B8C1BA205A20059040B /* Sources */,
501A3B8D1BA205A20059040B /* Frameworks */,
501A3B8E1BA205A20059040B /* Resources */,
);
buildRules = (
);
dependencies = (
501A3B971BA205A20059040B /* PBXTargetDependency */,
);
name = VIMVideoPlayerTests;
productName = VIMVideoPlayerTests;
productReference = 501A3B901BA205A20059040B /* VIMVideoPlayerTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
50E506FF1B1E23A600DF1F7A /* VIMVideoPlayer */ = {
isa = PBXNativeTarget;
buildConfigurationList = 50E507141B1E23A600DF1F7A /* Build configuration list for PBXNativeTarget "VIMVideoPlayer" */;
@@ -128,24 +141,6 @@
productReference = 50E507001B1E23A600DF1F7A /* libVIMVideoPlayer.a */;
productType = "com.apple.product-type.library.static";
};
50E5070A1B1E23A600DF1F7A /* VIMVideoPlayerTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 50E507171B1E23A600DF1F7A /* Build configuration list for PBXNativeTarget "VIMVideoPlayerTests" */;
buildPhases = (
50E507071B1E23A600DF1F7A /* Sources */,
50E507081B1E23A600DF1F7A /* Frameworks */,
50E507091B1E23A600DF1F7A /* Resources */,
);
buildRules = (
);
dependencies = (
50E5070E1B1E23A600DF1F7A /* PBXTargetDependency */,
);
name = VIMVideoPlayerTests;
productName = VIMVideoPlayerTests;
productReference = 50E5070B1B1E23A600DF1F7A /* VIMVideoPlayerTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -155,10 +150,10 @@
LastUpgradeCheck = 0630;
ORGANIZATIONNAME = Vimeo;
TargetAttributes = {
50E506FF1B1E23A600DF1F7A = {
CreatedOnToolsVersion = 6.3.1;
501A3B8F1BA205A20059040B = {
CreatedOnToolsVersion = 7.0;
};
50E5070A1B1E23A600DF1F7A = {
50E506FF1B1E23A600DF1F7A = {
CreatedOnToolsVersion = 6.3.1;
};
};
@@ -176,13 +171,13 @@
projectRoot = "";
targets = (
50E506FF1B1E23A600DF1F7A /* VIMVideoPlayer */,
50E5070A1B1E23A600DF1F7A /* VIMVideoPlayerTests */,
501A3B8F1BA205A20059040B /* VIMVideoPlayerTests */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
50E507091B1E23A600DF1F7A /* Resources */ = {
501A3B8E1BA205A20059040B /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -192,6 +187,14 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
501A3B8C1BA205A20059040B /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
501A3B931BA205A20059040B /* VIMVideoPlayerTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
50E506FC1B1E23A600DF1F7A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -201,24 +204,41 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
50E507071B1E23A600DF1F7A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
50E5070E1B1E23A600DF1F7A /* PBXTargetDependency */ = {
501A3B971BA205A20059040B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 50E506FF1B1E23A600DF1F7A /* VIMVideoPlayer */;
targetProxy = 50E5070D1B1E23A600DF1F7A /* PBXContainerItemProxy */;
targetProxy = 501A3B961BA205A20059040B /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
501A3B991BA205A20059040B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = VIMVideoPlayerTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.vimeo.VIMVideoPlayerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
501A3B9A1BA205A20059040B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
INFOPLIST_FILE = VIMVideoPlayerTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.vimeo.VIMVideoPlayerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
50E507121B1E23A600DF1F7A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -315,41 +335,17 @@
};
name = Release;
};
50E507181B1E23A600DF1F7A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = VIMVideoPlayerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
50E507191B1E23A600DF1F7A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = VIMVideoPlayerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
501A3B981BA205A20059040B /* Build configuration list for PBXNativeTarget "VIMVideoPlayerTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
501A3B991BA205A20059040B /* Debug */,
501A3B9A1BA205A20059040B /* Release */,
);
defaultConfigurationIsVisible = 0;
};
50E506FB1B1E23A600DF1F7A /* Build configuration list for PBXProject "VIMVideoPlayer" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -368,15 +364,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
50E507171B1E23A600DF1F7A /* Build configuration list for PBXNativeTarget "VIMVideoPlayerTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
50E507181B1E23A600DF1F7A /* Debug */,
50E507191B1E23A600DF1F7A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 50E506F81B1E23A600DF1F7A /* Project object */;
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "50E506FF1B1E23A600DF1F7A"
BuildableName = "libVIMVideoPlayer.a"
BlueprintName = "VIMVideoPlayer"
ReferencedContainer = "container:VIMVideoPlayer.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "501A3B8F1BA205A20059040B"
BuildableName = "VIMVideoPlayerTests.xctest"
BlueprintName = "VIMVideoPlayerTests"
ReferencedContainer = "container:VIMVideoPlayer.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "50E506FF1B1E23A600DF1F7A"
BuildableName = "libVIMVideoPlayer.a"
BlueprintName = "VIMVideoPlayer"
ReferencedContainer = "container:VIMVideoPlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "50E506FF1B1E23A600DF1F7A"
BuildableName = "libVIMVideoPlayer.a"
BlueprintName = "VIMVideoPlayer"
ReferencedContainer = "container:VIMVideoPlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "50E506FF1B1E23A600DF1F7A"
BuildableName = "libVIMVideoPlayer.a"
BlueprintName = "VIMVideoPlayer"
ReferencedContainer = "container:VIMVideoPlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
+1 -1
View File
@@ -94,7 +94,7 @@ static void *VideoPlayer_PlayerItemLoadedTimeRangesContext = &VideoPlayer_Player
- (void)setupPlayer
{
self.player = [AVPlayer playerWithPlayerItem:nil];
self.player = [[AVPlayer alloc] init];
self.player.muted = NO;
self.player.allowsExternalPlayback = YES;
}
+1 -1
View File
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.vimeo.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
+39
View File
@@ -0,0 +1,39 @@
//
// VIMVideoPlayerTests.m
// VIMVideoPlayerTests
//
// Created by Hanssen, Alfie on 9/10/15.
// Copyright © 2015 Vimeo. All rights reserved.
//
#import <XCTest/XCTest.h>
@interface VIMVideoPlayerTests : XCTestCase
@end
@implementation VIMVideoPlayerTests
- (void)setUp {
[super setUp];
// Put setup code here. This method is called before the invocation of each test method in the class.
}
- (void)tearDown {
// Put teardown code here. This method is called after the invocation of each test method in the class.
[super tearDown];
}
- (void)testExample {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}
- (void)testPerformanceExample {
// This is an example of a performance test case.
[self measureBlock:^{
// Put the code you want to measure the time of here.
}];
}
@end