From f78218ea34f43c04a7c642b80237aac569af8cb4 Mon Sep 17 00:00:00 2001 From: ryohey Date: Wed, 9 Jan 2019 17:43:55 +0900 Subject: [PATCH] swift4.2 --- .swift-version | 1 - Example/Podfile.lock | 6 +- .../SCNVideoWriter.xcodeproj/project.pbxproj | 62 +++---------------- .../xcschemes/SCNVideoWriter-Example.xcscheme | 4 +- Example/SCNVideoWriter/AppDelegate.swift | 2 +- SCNVideoWriter.podspec | 1 + SCNVideoWriter/Classes/SCNVideoWriter.swift | 6 +- 7 files changed, 18 insertions(+), 64 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index a3ec5a4..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -3.2 diff --git a/Example/Podfile.lock b/Example/Podfile.lock index dddf4f9..9eaf13f 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -6,11 +6,11 @@ DEPENDENCIES: EXTERNAL SOURCES: SCNVideoWriter: - :path: ../ + :path: "../" SPEC CHECKSUMS: - SCNVideoWriter: cc277dde2b4cc905d06f0a262f1f50b777e7a32d + SCNVideoWriter: 358dc7144310d4022b464abeabf9c6b1d5245294 PODFILE CHECKSUM: eaf2afc00a8480151634f3ef4607aaf4100137eb -COCOAPODS: 1.3.1 +COCOAPODS: 1.5.3 diff --git a/Example/SCNVideoWriter.xcodeproj/project.pbxproj b/Example/SCNVideoWriter.xcodeproj/project.pbxproj index 0336a79..25b8395 100644 --- a/Example/SCNVideoWriter.xcodeproj/project.pbxproj +++ b/Example/SCNVideoWriter.xcodeproj/project.pbxproj @@ -199,7 +199,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, CF95C6A3368ED2E216860FD3 /* [CP] Embed Pods Frameworks */, - A8740CFFDF34B86691D49509 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -218,8 +217,6 @@ 607FACE11AFB9204008FA782 /* Sources */, 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, - 0ADDD054D3268F1438B4A9C4 /* [CP] Embed Pods Frameworks */, - A1B699F35D66F0339FC0E592 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -238,7 +235,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { @@ -298,21 +295,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0ADDD054D3268F1438B4A9C4 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SCNVideoWriter_Tests/Pods-SCNVideoWriter_Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 34442463E1977BE1DF90A35F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -331,36 +313,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - A1B699F35D66F0339FC0E592 /* [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-SCNVideoWriter_Tests/Pods-SCNVideoWriter_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - A8740CFFDF34B86691D49509 /* [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-SCNVideoWriter_Example/Pods-SCNVideoWriter_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; CF95C6A3368ED2E216860FD3 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -461,12 +413,14 @@ 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_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; @@ -514,12 +468,14 @@ 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_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; @@ -563,7 +519,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "905ee6bd-d0b8-4820-ab2d-03b079ef72eb"; PROVISIONING_PROFILE_SPECIFIER = "noppelabs-*"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -582,7 +538,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "905ee6bd-d0b8-4820-ab2d-03b079ef72eb"; PROVISIONING_PROFILE_SPECIFIER = "noppelabs-*"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -607,7 +563,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -628,7 +584,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/SCNVideoWriter.xcodeproj/xcshareddata/xcschemes/SCNVideoWriter-Example.xcscheme b/Example/SCNVideoWriter.xcodeproj/xcshareddata/xcschemes/SCNVideoWriter-Example.xcscheme index 45d74c5..11b049c 100644 --- a/Example/SCNVideoWriter.xcodeproj/xcshareddata/xcschemes/SCNVideoWriter-Example.xcscheme +++ b/Example/SCNVideoWriter.xcodeproj/xcshareddata/xcschemes/SCNVideoWriter-Example.xcscheme @@ -1,6 +1,6 @@ Bool { + private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/SCNVideoWriter.podspec b/SCNVideoWriter.podspec index a51d121..1e4575a 100644 --- a/SCNVideoWriter.podspec +++ b/SCNVideoWriter.podspec @@ -15,6 +15,7 @@ And support video and overlay of ARKit. s.source = { :git => 'https://github.com/noppefoxwolf/SCNVideoWriter.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' + s.swift_version = '4.2' s.source_files = 'SCNVideoWriter/Classes/**/*' end diff --git a/SCNVideoWriter/Classes/SCNVideoWriter.swift b/SCNVideoWriter/Classes/SCNVideoWriter.swift index a8f0b9e..baec012 100644 --- a/SCNVideoWriter/Classes/SCNVideoWriter.swift +++ b/SCNVideoWriter/Classes/SCNVideoWriter.swift @@ -78,7 +78,7 @@ public class SCNVideoWriter { initialTime = CFAbsoluteTimeGetCurrent() displayLink = CADisplayLink(target: self, selector: #selector(updateDisplayLink)) displayLink?.preferredFramesPerSecond = options.fps - displayLink?.add(to: .main, forMode: .commonModes) + displayLink?.add(to: .main, forMode: .common) } @objc private func updateDisplayLink() { @@ -93,7 +93,7 @@ public class SCNVideoWriter { private func startInputPipeline() { writer.startWriting() - writer.startSession(atSourceTime: kCMTimeZero) + writer.startSession(atSourceTime: CMTime.zero) input.requestMediaDataWhenReady(on: frameQueue, using: {}) } @@ -104,7 +104,7 @@ public class SCNVideoWriter { guard let croppedImage = image.fill(at: videoSize) else { return } guard let pixelBuffer = PixelBufferFactory.make(with: videoSize, from: croppedImage, usingBuffer: pool) else { return } let value: Int64 = Int64(currentTime * CFTimeInterval(options.timeScale)) - let presentationTime = CMTimeMake(value, options.timeScale) + let presentationTime = CMTimeMake(value: value, timescale: options.timeScale) pixelBufferAdaptor.append(pixelBuffer, withPresentationTime: presentationTime) updateFrameHandler?(croppedImage, presentationTime) }