GitHub/VIMVideoPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: GitHub/VIMVideoPlayer:master
Branches Tags
GitHub/VIMVideoPlayer:v6.0.2 GitHub/VIMVideoPlayer:xcode-8-migration-integration-into-master GitHub/VIMVideoPlayer:master GitHub/VIMVideoPlayer:xcode-8-migration GitHub/VIMVideoPlayer:v6.1.2
GitHub/VIMVideoPlayer:6.0.1 GitHub/VIMVideoPlayer:6.0.0 GitHub/VIMVideoPlayer:5.6.0 GitHub/VIMVideoPlayer:5.5.5 GitHub/VIMVideoPlayer:5.5.3 GitHub/VIMVideoPlayer:5.5.1 GitHub/VIMVideoPlayer:5.5 GitHub/VIMVideoPlayer:5.4.2 GitHub/VIMVideoPlayer:5.4.1 GitHub/VIMVideoPlayer:1.1 GitHub/VIMVideoPlayer:v1.0.1 GitHub/VIMVideoPlayer:v1.0
..
pull from: GitHub/VIMVideoPlayer:xcode-8-migration-integration-into-master
Branches Tags
GitHub/VIMVideoPlayer:v6.0.2 GitHub/VIMVideoPlayer:xcode-8-migration-integration-into-master GitHub/VIMVideoPlayer:master GitHub/VIMVideoPlayer:xcode-8-migration GitHub/VIMVideoPlayer:v6.1.2
GitHub/VIMVideoPlayer:6.0.1 GitHub/VIMVideoPlayer:6.0.0 GitHub/VIMVideoPlayer:5.6.0 GitHub/VIMVideoPlayer:5.5.5 GitHub/VIMVideoPlayer:5.5.3 GitHub/VIMVideoPlayer:5.5.1 GitHub/VIMVideoPlayer:5.5 GitHub/VIMVideoPlayer:5.4.2 GitHub/VIMVideoPlayer:5.4.1 GitHub/VIMVideoPlayer:1.1 GitHub/VIMVideoPlayer:v1.0.1 GitHub/VIMVideoPlayer:v1.0

2 Commits
master .. xcode-8-migration-integration-into-master

Author SHA1 Message Date
Nicole Lehrer 6d1715e730 Merge branch 'xcode-8-migration' into xcode-8-migration-integration-into-master 2016-10-19 16:39:18 -04:00
Gavin King 48f3222d28 Upgrading to Swift 2.3 2016-09-27 16:07:20 -04:00
2 changed files with 28 additions and 0 deletions
Expand all files Collapse all files
Examples/VimeoPlayer-iOS-Example/VimeoPlayer-iOS-Example.xcodeproj/project.pbxproj
+21
View File
@@ -210,13 +210,19 @@
TargetAttributes = {
AF87202C1CA44FBD004C752C = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 35R365FS4Q;
LastSwiftMigration = 0800;
};
AF8720401CA44FBD004C752C = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 35R365FS4Q;
LastSwiftMigration = 0800;
TestTargetID = AF87202C1CA44FBD004C752C;
};
AF87204B1CA44FBD004C752C = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 35R365FS4Q;
LastSwiftMigration = 0800;
TestTargetID = AF87202C1CA44FBD004C752C;
};
};
@@ -350,6 +356,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 35R365FS4Q;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -394,6 +401,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 35R365FS4Q;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -415,11 +423,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 35R365FS4Q;
INFOPLIST_FILE = "VimeoPlayer-iOS-Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vimeo.VimeoPlayer-iOS-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "${SRCROOT}/VimeoPlayer-iOS-Example/Bridge.h";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -427,11 +437,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 35R365FS4Q;
INFOPLIST_FILE = "VimeoPlayer-iOS-Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vimeo.VimeoPlayer-iOS-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "${SRCROOT}/VimeoPlayer-iOS-Example/Bridge.h";
SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -439,10 +451,12 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = 35R365FS4Q;
INFOPLIST_FILE = "VimeoPlayer-iOS-ExampleTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vimeo.VimeoPlayer-iOS-ExampleTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VimeoPlayer-iOS-Example.app/VimeoPlayer-iOS-Example";
};
name = Debug;
@@ -451,10 +465,12 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = 35R365FS4Q;
INFOPLIST_FILE = "VimeoPlayer-iOS-ExampleTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vimeo.VimeoPlayer-iOS-ExampleTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VimeoPlayer-iOS-Example.app/VimeoPlayer-iOS-Example";
};
name = Release;
@@ -466,6 +482,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vimeo.VimeoPlayer-iOS-ExampleUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
TEST_TARGET_NAME = "VimeoPlayer-iOS-Example";
USES_XCTRUNNER = YES;
};
@@ -478,6 +495,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vimeo.VimeoPlayer-iOS-ExampleUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
TEST_TARGET_NAME = "VimeoPlayer-iOS-Example";
USES_XCTRUNNER = YES;
};
@@ -502,6 +520,7 @@
AF8720571CA44FBD004C752C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
AF8720581CA44FBD004C752C /* Build configuration list for PBXNativeTarget "VimeoPlayer-iOS-ExampleTests" */ = {
isa = XCConfigurationList;
@@ -510,6 +529,7 @@
AF87205A1CA44FBD004C752C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
AF87205B1CA44FBD004C752C /* Build configuration list for PBXNativeTarget "VimeoPlayer-iOS-ExampleUITests" */ = {
isa = XCConfigurationList;
@@ -518,6 +538,7 @@
AF87205D1CA44FBD004C752C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
VIMVideoPlayer-Framework/VimeoPlayer.xcodeproj/project.pbxproj
+7
View File
@@ -161,9 +161,11 @@
TargetAttributes = {
AF871FFD1CA447E5004C752C = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 35R365FS4Q;
};
AF8720071CA447E5004C752C = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 35R365FS4Q;
};
};
};
@@ -322,7 +324,9 @@
AF8720131CA447E5004C752C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 35R365FS4Q;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -340,6 +344,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 35R365FS4Q;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -356,6 +361,7 @@
AF8720161CA447E5004C752C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = 35R365FS4Q;
INFOPLIST_FILE = VimeoPlayerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.vimeo.VimeoPlayerTests;
@@ -366,6 +372,7 @@
AF8720171CA447E5004C752C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = 35R365FS4Q;
INFOPLIST_FILE = VimeoPlayerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.vimeo.VimeoPlayerTests;