Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile errors and upgrade to Swift 4 #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix compile errors and upgrade to Swift 4 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cd015d
Update pods to fix complie errors
HackingGate May 19, 2019
bd17539
Update CocoaPods
HackingGate May 19, 2019
65faefa
Upgrade to Swift 4
HackingGate May 19, 2019
a90037a
Upgrade Demo to Swift 4
HackingGate May 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 34 additions & 25 deletions DemoVideoPlaybackKit/DemoVideoPlaybackKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@
272A1CDB1EAFE62F007F5816 /* Resources */,
272A1D351EAFF0EC007F5816 /* CopyFiles */,
F452070E7DB2F292706AEB29 /* [CP] Embed Pods Frameworks */,
11B3DA2FCD5590DFA322B273 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -276,23 +275,26 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0830;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = ustwo;
TargetAttributes = {
272A1CDC1EAFE62F007F5816 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = WRHWKXLX7C;
LastSwiftMigration = 0940;
ProvisioningStyle = Manual;
};
272A1CF01EAFE62F007F5816 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = WRHWKXLX7C;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic;
TestTargetID = 272A1CDC1EAFE62F007F5816;
};
272A1CFB1EAFE62F007F5816 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = WRHWKXLX7C;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic;
TestTargetID = 272A1CDC1EAFE62F007F5816;
};
Expand Down Expand Up @@ -347,21 +349,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
11B3DA2FCD5590DFA322B273 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoVideoPlaybackKit/Pods-DemoVideoPlaybackKit-resources.sh\"\n";
showEnvVarsInLog = 0;
};
5E3BA80C1568E79DEC9BB9C2 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -386,7 +373,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-DemoVideoPlaybackKit/Pods-DemoVideoPlaybackKit-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-DemoVideoPlaybackKit/Pods-DemoVideoPlaybackKit-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/ASValueTrackingSlider/ASValueTrackingSlider.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/AlamofireImage/AlamofireImage.framework",
Expand All @@ -407,7 +394,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoVideoPlaybackKit/Pods-DemoVideoPlaybackKit-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DemoVideoPlaybackKit/Pods-DemoVideoPlaybackKit-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -486,15 +473,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -536,15 +531,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -592,7 +595,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "60e9b7bf-2c58-4473-9d34-c0d848654d98";
PROVISIONING_PROFILE_SPECIFIER = "Root Development Profile";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -618,7 +622,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f8352ca0-bb24-41c4-adf3-943f213d4dae";
PROVISIONING_PROFILE_SPECIFIER = "Root In House";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -632,7 +637,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = ustwo.com.DemoVideoPlaybackKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DemoVideoPlaybackKit.app/DemoVideoPlaybackKit";
};
name = Debug;
Expand All @@ -647,7 +653,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = ustwo.com.DemoVideoPlaybackKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DemoVideoPlaybackKit.app/DemoVideoPlaybackKit";
};
name = Release;
Expand All @@ -661,7 +668,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = ustwo.com.DemoVideoPlaybackKitUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = DemoVideoPlaybackKit;
};
name = Debug;
Expand All @@ -675,7 +683,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = ustwo.com.DemoVideoPlaybackKitUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = DemoVideoPlaybackKit;
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions DemoVideoPlaybackKit/DemoVideoPlaybackKit/Cell/VideoTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class VideoTableViewCell: UITableViewCell, VPKViewInCellProtocol {

make.height.equalTo(250) //Ideally we would use an aspect ratio adjusted height based on data from json
}
safeView.setContentHuggingPriority(UILayoutPriorityDefaultHigh, for: .horizontal)
setContentHuggingPriority(UILayoutPriorityDefaultHigh, for: .vertical)
safeView.setContentHuggingPriority(UILayoutPriority.defaultHigh, for: .horizontal)
setContentHuggingPriority(UILayoutPriority.defaultHigh, for: .vertical)
self.setNeedsDisplay()

}
Expand Down
10 changes: 5 additions & 5 deletions DemoVideoPlaybackKit/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ platform :ios, '10.0'
use_frameworks!

target 'DemoVideoPlaybackKit' do
pod 'RxSwift'
pod 'RxCocoa'
pod 'SnapKit'
pod 'VideoPlaybackKit'
pod 'RxSwift', '~> 4.0'
pod 'RxCocoa', '~> 4.0'
pod 'SnapKit', '~> 4.0'
pod 'VideoPlaybackKit', :path => '../VideoPlaybackKit.podspec'
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
config.build_settings['SWIFT_VERSION'] = '3.0'
config.build_settings['SWIFT_VERSION'] = '4.0'
end
end
end
57 changes: 37 additions & 20 deletions DemoVideoPlaybackKit/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,46 @@
PODS:
- Alamofire (4.5.0)
- AlamofireImage (3.2.0):
- Alamofire (~> 4.1)
- Alamofire (4.8.2)
- AlamofireImage (3.5.2):
- Alamofire (~> 4.8)
- ASValueTrackingSlider (0.12.1)
- RxCocoa (3.5.0):
- RxSwift (~> 3.4)
- RxSwift (3.5.0)
- SnapKit (3.2.0)
- RxCocoa (4.5.0):
- RxSwift (>= 4.4.2, ~> 4.4)
- RxSwift (4.5.0)
- SnapKit (4.2.0)
- VideoPlaybackKit (0.2.3):
- Alamofire (~> 4.4)
- AlamofireImage (~> 3.1)
- ASValueTrackingSlider
- SnapKit (~> 4.0)

DEPENDENCIES:
- Alamofire
- AlamofireImage
- ASValueTrackingSlider
- RxCocoa
- RxSwift
- SnapKit
- RxCocoa (~> 4.0)
- RxSwift (~> 4.0)
- SnapKit (~> 4.0)
- VideoPlaybackKit (from `../VideoPlaybackKit.podspec`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Alamofire
- AlamofireImage
- ASValueTrackingSlider
- RxCocoa
- RxSwift
- SnapKit

EXTERNAL SOURCES:
VideoPlaybackKit:
:path: "../VideoPlaybackKit.podspec"

SPEC CHECKSUMS:
Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
AlamofireImage: 157ed682cc81d3b9db4fb90c1f12180ac552d93b
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999
ASValueTrackingSlider: 5261de3fcf00adb339efc93885e8f0bc99e703cd
RxCocoa: a0a09f45d0e5b48ecb6a4a7b4b4c89c88d3f633f
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
SnapKit: 1ca44df72cfa543218d177cb8aab029d10d86ea7
RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
VideoPlaybackKit: 9defb014a74ba4ff508fe0474396cf251dea3fd4

PODFILE CHECKSUM: 6955c22fb8bf4044db768f734d487bd77de77705
PODFILE CHECKSUM: 3d7573804d6950236287ccb706a752f60fd605f7

COCOAPODS: 1.2.1
COCOAPODS: 1.6.2
2 changes: 1 addition & 1 deletion DemoVideoPlaybackKit/Pods/Alamofire/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading